Merge pull request #19 from Demo-Liu/2.3

2.3

App.config

@@ -21,10 +21,14 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <appSettings>
-    <add key="Version" value="2.2" />
+    <add key="Version" value="2.3.10" />
     <add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
     <add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
     <add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />

Constant/CommonEnum.cs

@@ -14,6 +14,6 @@ namespace GeekDesk.Constant
         IMAGE_HEIGHT_AM = 52, //动画变换高度
         IMAGE_PANEL_WIDTH = 110, //图标容器宽度
         IMAGE_PANEL_HEIGHT = 90, //图标容器高度
-        WINDOW_ANIMATION_TIME = 200, //主窗口动画时间
+        WINDOW_ANIMATION_TIME = 200, //主窗口动画时间,
     }
 }

Constant/TodoTaskExecType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GeekDesk.Constant
+{
+    public enum TodoTaskExecType
+    {
+        SET_TIME = 1, //指定时间
+        CRON = 2 //cron表达式
+    }
+}

Control/Other/BacklogNotificatin.xaml.cs

@@ -1,6 +1,9 @@
-using GeekDesk.Task;
+using GeekDesk.Constant;
+using GeekDesk.Task;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
+using HandyControl.Controls;
+using Quartz;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,8 +37,36 @@ namespace GeekDesk.Control.Other
         {
             ToDoInfo info = this.DataContext as ToDoInfo;
             info.DoneTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            appData.ToDoList.Remove(info); //执行任务删除
+            if (info.ExecType == TodoTaskExecType.CRON)
-            appData.HiToDoList.Add(info);  //添加历史任务
+            {
+                CronExpression exp = new CronExpression(info.Cron);
+                DateTime dtNow = DateTime.Now;
+                DateTimeOffset ddo = DateTime.SpecifyKind(dtNow, DateTimeKind.Local);
+                string nextExecTime = ddo.LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                info.ExeTime = nextExecTime;
+
+                DateTime nextTime = ddo.LocalDateTime;
+                TimeSpan ts = nextTime.Subtract(dtNow);
+                int minutes = (int)Math.Ceiling(ts.TotalMinutes);
+                if (minutes < 0)
+                {
+                    minutes = 0;
+                }
+                if (minutes > 60)
+                {
+                    int m = minutes % 60;
+                    int h = minutes / 60;
+                    Growl.SuccessGlobal("下次任务将在 " + h + " 小时零 " + m + " 分钟后提醒您!");
+                }
+                else
+                {
+                    Growl.SuccessGlobal("下次任务将在 " + minutes + " 分钟后提醒您!");
+                }
+            } else
+            {
+                appData.ToDoList.Remove(info); //执行任务删除
+                appData.HiToDoList.Add(info);  //添加历史任务
+            }
             ToDoTask.activityBacklog[info].Close(); //关闭桌面通知
             ToDoTask.activityBacklog.Remove(info);//激活任务删除
             CommonCode.SaveAppData(appData);
@@ -93,9 +124,11 @@ namespace GeekDesk.Control.Other
             {
                 case "分":
                     info.ExeTime = DateTime.Now.AddMinutes(time).ToString("yyyy-MM-dd HH:mm:ss");
+                    Growl.SuccessGlobal("将在 " + time + " 分钟后再次提醒您!");
                     break;
                 case "时":
                     info.ExeTime = DateTime.Now.AddHours(time).ToString("yyyy-MM-dd HH:mm:ss");
+                    Growl.SuccessGlobal("将在 " + time + " 小时后再次提醒您!");
                     break;
             }
             ToDoTask.activityBacklog[info].Close(); //关闭桌面通知

Control/UserControls/Config/AboutControl.xaml.cs

@@ -32,6 +32,7 @@ namespace GeekDesk.Control.UserControls.Config
             ZFBCode.Source = ImageUtil.Base64ToBitmapImage(Constants.ZFB_CODE_IMG_BASE64);
         }
 
+
         /// <summary>
         /// 移动窗口
         /// </summary>

Control/UserControls/Config/MotionControl.xaml.cs

@@ -30,9 +30,9 @@ namespace GeekDesk.Control.UserControls.Config
     public partial class MotionControl : UserControl
     {
         public static bool hotkeyFinished = true; //热键设置结束
-        private static KeyEventArgs prevKeyTemp; //上一个按键
+        private  KeyEventArgs prevKeyTemp; //上一个按键
-        private static List<KeyEventArgs> keysTemp = new List<KeyEventArgs>();//存储一次快捷键集合
+        private readonly List<KeyEventArgs> keysTemp = new List<KeyEventArgs>();//存储一次快捷键集合
-        private static AppConfig appConfig = MainWindow.appData.AppConfig;
+        private readonly AppConfig appConfig = MainWindow.appData.AppConfig;
 
         public MotionControl()
         {

Control/UserControls/Config/ThemeControl.xaml

@@ -12,11 +12,11 @@
 
     <Grid>
         <Grid  MouseDown="DragMove" Background="AliceBlue">
-            <hc:SimplePanel Margin="20" >
+            <StackPanel Margin="20" >
-                <hc:UniformSpacingPanel Spacing="10" Margin="0,0,-40,-12" Grid.ColumnSpan="4">
+                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
                     <TextBlock Text="背景图片" VerticalAlignment="Center"/>
                 </hc:UniformSpacingPanel>
-                <hc:UniformSpacingPanel Spacing="10" Margin="19,20,-59,-31.5" Grid.ColumnSpan="4">
+                <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
                     <TextBlock Text="图片路径:" VerticalAlignment="Center"/>
                     <TextBlock Text="{Binding BacImgName}" Width="200" 
                            VerticalAlignment="Center"
@@ -28,7 +28,7 @@
                     <Button Content="修改" Click="BGButton_Click"/>
                 </hc:UniformSpacingPanel>
 
-                <hc:UniformSpacingPanel Spacing="10" Margin="19,60,11,-36.433" Grid.ColumnSpan="4">
+                <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0"  Grid.ColumnSpan="4">
                     <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
                         <CheckBox.Background>
                             <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
@@ -38,16 +38,16 @@
                     </CheckBox>
                 </hc:UniformSpacingPanel>
 
-                <hc:Divider LineStrokeDashArray="3,3" Margin="0,91.5,0,34.5" LineStroke="Black" Grid.ColumnSpan="4"/>
+                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
 
-                <StackPanel Margin="0,30,0,0">
+                <StackPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,80,-40,-89.5" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
                         <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,110,-40,-122" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding CardOpacity}"
                                   Maximum="100"
-                                  Margin="0,-12,-313.5,19.5"
+                                  Width="350"
                                   >
                             <hc:PreviewSlider.PreviewContent>
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
@@ -56,13 +56,13 @@
                     </hc:UniformSpacingPanel>
 
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,135,-40,-161.626" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="背景图片不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,155,-40,-183" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding BgOpacity}"
                                   Maximum="100"
-                                  Margin="0,0,-313.5,7.5"
+                                  Width="350"
                                   >
                             <hc:PreviewSlider.PreviewContent>
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
@@ -71,14 +71,14 @@
                     </hc:UniformSpacingPanel>
 
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,195,-40,-208.813" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="主面板不透明度" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,215,-40,-241" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding PannelOpacity}"
                                   Minimum="50"
                                   Maximum="100"
-                                  Margin="0,0,-313.5,7.5"
+                                  Width="350"
                                   >
                             <hc:PreviewSlider.PreviewContent>
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
@@ -86,27 +86,44 @@
                         </hc:PreviewSlider>
                     </hc:UniformSpacingPanel>
 
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,245,-40,-279.313" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                         <TextBlock Text="主面板圆角大小" VerticalAlignment="Center"/>
                     </hc:UniformSpacingPanel>
-                    <hc:UniformSpacingPanel Spacing="10" Margin="0,265,-40,-321" Grid.ColumnSpan="4">
+                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                         <hc:PreviewSlider Value="{Binding PannelCornerRadius}"
                                   Maximum="25"
-                                  Margin="0,0,-313.5,7.5"
+                                  Width="350"
                                   >
                             <hc:PreviewSlider.PreviewContent>
                                 <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
                             </hc:PreviewSlider.PreviewContent>
                         </hc:PreviewSlider>
                     </hc:UniformSpacingPanel>
+                    <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
+                        <TextBlock Text="图标大小" VerticalAlignment="Center"/>
+                    </hc:UniformSpacingPanel>
+                    <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4"
+                                            Background="#00FFFFFF"
+                                            PreviewMouseLeftButtonDown="PreviewSlider_MouseLeftButtonUp"
+                                            >
+                        <hc:PreviewSlider Value="{Binding ImageWidth, Mode=TwoWay}"
+                                          Minimum="40"
+                                          Maximum="60"
+                                          Width="350"
+                                          >
+                            <hc:PreviewSlider.PreviewContent>
+                                <Label Style="{StaticResource LabelPrimary}" Content="{Binding Path=(hc:PreviewSlider.PreviewPosition),RelativeSource={RelativeSource Self}}" ContentStringFormat="#0"/>
+                            </hc:PreviewSlider.PreviewContent>
+                        </hc:PreviewSlider>
+                    </hc:UniformSpacingPanel>
                 </StackPanel>
-                <hc:Divider LineStrokeDashArray="3,3" Margin="0,341.5,0,-215.5" LineStroke="Black" Grid.ColumnSpan="4"/>
+                <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
-                <hc:UniformSpacingPanel Spacing="10" Margin="0,354,-40,-388.313" Grid.ColumnSpan="4">
+                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
                     <TextBlock VerticalAlignment="Center" Text="图标字体颜色:" />
                     <TextBlock VerticalAlignment="Center" Text="{Binding TextColor}" Width="100"/>
                     <Button Content="选择"  Click="ColorButton_Click"/>
                 </hc:UniformSpacingPanel>
-            </hc:SimplePanel>
+            </StackPanel>
         </Grid>
             
         <StackPanel x:Name="ColorPanel" Visibility="Collapsed" VerticalAlignment="Center">

Control/UserControls/Config/ThemeControl.xaml.cs

@@ -3,6 +3,7 @@ using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -87,5 +88,40 @@ namespace GeekDesk.Control.UserControls.Config
                 Window.GetWindow(this).DragMove();
             }
         }
+
+        private void PreviewSlider_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            CheckButtonUpClass cbu = new CheckButtonUpClass
+            {
+                e = e
+            };
+            System.Threading.ThreadStart ts = new System.Threading.ThreadStart(cbu.CheckButtonUp);
+            System.Threading.Thread t = new System.Threading.Thread(ts);
+            t.Start();
+        }
+
+        private class CheckButtonUpClass
+        {
+            public MouseButtonEventArgs e;
+
+            public void CheckButtonUp()
+            {
+                while (true)
+                {
+                    if (e.LeftButton == MouseButtonState.Released)
+                    {
+                        App.Current.Dispatcher.Invoke((Action)(() =>
+                        {
+                            AppData appData = MainWindow.appData;
+                            ObservableCollection<IconInfo> selectIcons = appData.AppConfig.SelectedMenuIcons;
+                            appData.AppConfig.SelectedMenuIcons = null;
+                            appData.AppConfig.SelectedMenuIcons = selectIcons;
+                        }));
+                        return;
+                    }
+                    System.Threading.Thread.Sleep(50);
+                }
+            }
+        }
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -12,12 +12,9 @@
     <UserControl.Resources>
         <!--右侧栏样式动画-->
         <Style x:Key="ImageStyle" TargetType="Image">
-            <Setter Property="Width"   Value="{Binding ImageWidth}"/>
+            <Setter Property="Width"   Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}"/>
-            <Setter Property="Height"  Value="{Binding ImageHeight}"/>
+            <Setter Property="Height"  Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageHeight, Mode=OneWay}"/>
             <Setter Property="Source"  Value="{Binding BitmapImage}"/>
-            <Setter Property="RenderOptions.BitmapScalingMode" Value="LowQuality" />
-            <Setter Property="RenderOptions.CachingHint" Value="Cache" />
-            
         </Style>
         <Style x:Key="MyListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
             <Setter Property="Template">
@@ -60,9 +57,9 @@
                 </ListBox.Background>
                 <ListBox.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight}" 
+                        <DraggAnimatedPanel:DraggAnimatedPanel Background="#00FFFFFF"
-                                                               ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth}"
+                                                               ItemsWidth="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
-                                                               Background="#00FFFFFF"
+                                                               ItemsHeight="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}"
                                                                HorizontalAlignment="Center" 
                                                                SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
                     </ItemsPanelTemplate>
@@ -82,18 +79,22 @@
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource MyListBoxItemStyle}">
                         <Setter Property="ContextMenu" Value="{StaticResource IconDialog}"/>
+                        <!--<Setter Property="Width" Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"/>
+                        <Setter Property="Height" Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}"/>-->
                     </Style>
                 </ListBox.ItemContainerStyle>
+                <!--Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}" 
+                                        Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"-->
 
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <StackPanel Tag="{Binding}"
+                        <hc:SimpleStackPanel Tag="{Binding}"
-                                        Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight}"
+                                        Height="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelHeight, Mode=OneWay}" 
-                                        Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth}"
+                                        Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImgPanelWidth, Mode=OneWay}"
                                         HorizontalAlignment="Center"
-                                        hc:Poptip.HitMode="None" 
+                                        hc:Poptip.HitMode="None"
                                         hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                        hc:Poptip.Content="{Binding Content}" 
+                                        hc:Poptip.Content="{Binding Content}"
                                         hc:Poptip.Placement="BottomLeft"
                                         Background="#00FFFFFF"
                                         MouseLeftButtonUp="IconClick"
@@ -111,7 +112,7 @@
                                        VerticalAlignment="Center" 
                                        Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
                                        Text="{Binding Name}"/>
-                        </StackPanel>
+                        </hc:SimpleStackPanel>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -3,6 +3,7 @@ using GeekDesk.Constant;
 using GeekDesk.Control.Other;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
+using HandyControl.Controls;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -11,6 +12,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -263,46 +265,142 @@ namespace GeekDesk.Control.UserControls.PannelCard
 
         private void StackPanel_MouseEnter(object sender, MouseEventArgs e)
         {
-            ImgStoryBoard(sender, (int)CommonEnum.IMAGE_HEIGHT_AM, (int)CommonEnum.IMAGE_WIDTH_AM, 1);
+
+            double width = appData.AppConfig.ImageWidth;
+            double height = appData.AppConfig.ImageHeight;
+            width += width * 0.15;
+            height += height * 0.15;
+            ImgStoryBoard(sender, (int)width, (int)height, 1, true);
         }
 
         private void StackPanel_MouseLeave(object sender, MouseEventArgs e)
         {
-            ImgStoryBoard(sender, (int)CommonEnum.IMAGE_HEIGHT, (int)CommonEnum.IMAGE_WIDTH, 220);
+            ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 220);
         }
 
 
-        private void ImgStoryBoard(object sender, int height, int width, int milliseconds)
+        private void ImgStoryBoard(object sender, int height, int width, int milliseconds, bool checkRmStoryboard = false)
         {
 
             if (appData.AppConfig.PMModel) return;
 
-            StackPanel sp = sender as StackPanel;
+            Panel sp = sender as Panel;
+
+            DependencyObject dos =  sp.Parent;
 
             Image img = sp.Children[0] as Image;
 
+            double afterHeight = img.Height;
+            double afterWidth = img.Width;
 
-            DoubleAnimation heightAnimation = new DoubleAnimation();
+            //动画定义
-            DoubleAnimation widthAnimation = new DoubleAnimation();
+            Storyboard myStoryboard = new Storyboard();
+           
 
-            heightAnimation.From = img.Height;
-            widthAnimation.From = img.Width;
 
-            heightAnimation.To = height;
+            DoubleAnimation heightAnimation = new DoubleAnimation 
-            widthAnimation.To = width;
+            {
-
+                From = afterHeight,
-            heightAnimation.Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds));
+                To = height,
-            widthAnimation.Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds));
+                Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds))
+            };
+            DoubleAnimation widthAnimation = new DoubleAnimation 
+            {
+                From = afterWidth,
+                To = width,
+                Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds))
+            };
 
 
             Timeline.SetDesiredFrameRate(heightAnimation, 60);
             Timeline.SetDesiredFrameRate(widthAnimation, 60);
 
-            img.BeginAnimation(HeightProperty, null);
+            Storyboard.SetTarget(widthAnimation, img);
-            img.BeginAnimation(WidthProperty, null);
+            Storyboard.SetTargetProperty(widthAnimation, new PropertyPath("Width"));
+            Storyboard.SetTarget(heightAnimation, img);
+            Storyboard.SetTargetProperty(heightAnimation, new PropertyPath("Height"));
 
-            img.BeginAnimation(HeightProperty, heightAnimation);
+            myStoryboard.Children.Add(heightAnimation);
+            myStoryboard.Children.Add(widthAnimation);
+
+            CheckRemoveStoryboard crs = new CheckRemoveStoryboard
+            {
+                sb = myStoryboard,
+                sp = sp,
+                heightAnimation = heightAnimation,
+                widthAnimation = widthAnimation,
+                img = img,
+                isMouseOver = !checkRmStoryboard
+            };
+
+            heightAnimation.Completed += (s, e) =>
+            {
+                if (checkRmStoryboard)
+                {
+                    ThreadStart ts = new ThreadStart(crs.Remove);
+                    System.Threading.Thread t = new System.Threading.Thread(ts);
+                    t.Start();
+                } else
+                {
+                    img.BeginAnimation(WidthProperty, null);
+                    img.BeginAnimation(HeightProperty, null);
+                }
+            };
             img.BeginAnimation(WidthProperty, widthAnimation);
+            img.BeginAnimation(HeightProperty, heightAnimation);
+
+            //myStoryboard.Completed += (s, e) =>
+            //{
+            //    if (checkRmStoryboard || true)
+            //    {
+            //        ThreadStart ts = new ThreadStart(crs.Remove);
+            //        System.Threading.Thread t = new System.Threading.Thread(ts);
+            //        t.Start();
+            //    }
+            //    else
+            //    {
+            //        myStoryboard.Remove();
+            //    }
+            //};
+            //myStoryboard.Begin();
+        }
+
+        private class CheckRemoveStoryboard
+        {
+            public Storyboard sb;
+            public Panel sp;
+            public Image img;
+            public DoubleAnimation heightAnimation;
+            public DoubleAnimation widthAnimation;
+            public bool isMouseOver;
+            public void Remove()
+            {
+                while (true)
+                {
+                    if (sp.IsMouseOver == isMouseOver)
+                    {
+                        App.Current.Dispatcher.Invoke((Action)(() =>
+                        {
+                            img.BeginAnimation(WidthProperty, null);
+                            img.BeginAnimation(HeightProperty, null);
+                            //heightAnimation.FillBehavior = FillBehavior.Stop;
+                            //widthAnimation.FillBehavior = FillBehavior.Stop;
+                        }));
+                        return;
+                    }
+                    else
+                    {
+                        System.Threading.Thread.Sleep(500);
+                    }
+                }
+            }
+        }
+
+        public void RemoveSB(Object sb)
+        {
+            Storyboard sb2 = sb as Storyboard;
+            System.Threading.Thread.Sleep(500);
+            sb2.Remove();
         }
 
         private void AddUrlIcon(object sender, RoutedEventArgs e)

Control/UserControls/ToDo/TodoControl.xaml.cs

@@ -19,12 +19,18 @@ using System.Windows.Shapes;
 
 namespace GeekDesk.Control.UserControls.Backlog
 {
+
+    public enum ToDoType
+    {
+        HISTORY = 1,
+        NEW = 2
+    }
     /// <summary>
     /// BacklogControl.xaml 的交互逻辑
     /// </summary>
     public partial class TodoControl : UserControl
     {
-        private AppData appData = MainWindow.appData;
+        public ToDoType type;
         public TodoControl()
         {
             InitializeComponent();
@@ -37,7 +43,14 @@ namespace GeekDesk.Control.UserControls.Backlog
             {
                 if (isConfirmed)
                 {
-                    appData.ToDoList.Remove(info);
+                    if (type == ToDoType.NEW)
+                    {
+                        MainWindow.appData.ToDoList.Remove(info);
+                    }
+                    else
+                    {
+                        MainWindow.appData.HiToDoList.Remove(info);
+                    }
                     CommonCode.SaveAppData(MainWindow.appData);
                 }
                 return true;

Control/Windows/ConfigWindow.xaml

@@ -121,7 +121,7 @@
                 </hc:SideMenu>
             </hc:Card>
             <hc:ScrollViewer  Grid.Row="0" Grid.Column="1">
-                <hc:Card x:Name="RightCard" Height="448">
+                <hc:Card x:Name="RightCard" Height="480">
                 </hc:Card>
             </hc:ScrollViewer>
 

Control/Windows/ConfigWindow.xaml.cs

@@ -15,10 +15,10 @@ namespace GeekDesk.Control.Windows
     /// </summary>
     public partial class ConfigWindow
     {
-        private static AboutControl about = new AboutControl();
+        private static readonly AboutControl about = new AboutControl();
-        private static ThemeControl theme = new ThemeControl();
+        private static readonly ThemeControl theme = new ThemeControl();
-        private static MotionControl motion = new MotionControl();
+        private static readonly MotionControl motion = new MotionControl();
-        private static OtherControl other = new OtherControl();
+        private static readonly OtherControl other = new OtherControl();
         public MainWindow mainWindow;
 
         private ConfigWindow(AppConfig appConfig, MainWindow mainWindow)

Control/Windows/ToDoInfoWindow.xaml

@@ -4,10 +4,11 @@
            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
            xmlns:hc="https://handyorg.github.io/handycontrol"
+           xmlns:cvt="clr-namespace:GeekDesk.Converts"
            xmlns:local="clr-namespace:GeekDesk"
            mc:Ignorable="d"
            WindowStartupLocation="CenterScreen"
-           Height="670" 
+           Height="700" 
            Width="450" 
            Title="TaskInfo"
            WindowStyle="None"
@@ -15,7 +16,7 @@
            Background="Transparent" ShowInTaskbar="False"
         >
     <Window.Resources>
-       
+        <cvt:TodoTaskExecConvert x:Key="TodoTaskExecConvert"/>
     </Window.Resources>
     <Border CornerRadius="3" BorderThickness="2" BorderBrush="Black" Margin="0,0,0,313.323"  MouseDown="DragMove">
         <Border.Background>
@@ -23,48 +24,72 @@
         </Border.Background>
         <Border.Resources>
             <Style x:Key="LeftTB" TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
-                <Setter Property="Width" Value="65"/>
+                <Setter Property="Width" Value="67"/>
                 <Setter Property="HorizontalAlignment" Value="Left"/>
                 <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="TextAlignment" Value="Center"/>
                 <Setter Property="FontSize" Value="14"/>
             </Style>
         </Border.Resources>
         <Grid Margin="0,0,0,8">
-            <hc:SimplePanel Margin="20" HorizontalAlignment="Center">
+            <StackPanel Margin="20" HorizontalAlignment="Center">
                 <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                    <WrapPanel>
+                    <WrapPanel VerticalAlignment="Center">
                         <TextBlock Text="待办任务:"  Style="{StaticResource LeftTB}"/>
                         <TextBlock Text="*" Foreground="Red" />
                     </WrapPanel>
-                    <TextBox x:Name="Title" Width="290" FontSize="14" />
+                    <TextBox x:Name="Title" Width="290" Text="{Binding Title, Mode=OneWay}" FontSize="14" />
                 </hc:UniformSpacingPanel>
 
-                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,48.997,0,-48.997">
+                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                     <TextBlock Text="待办详情:"  Style="{StaticResource LeftTB}"/>
                     <TextBox x:Name="Msg" TextWrapping="Wrap"
+                             Margin="5,0,0,0"
+                             Text="{Binding Msg, Mode=OneWay}"
                              AcceptsReturn="True"
                              VerticalScrollBarVisibility="Visible" 
                              Height="100" MaxHeight="150"  MinHeight="100" Width="290" MinWidth="290" 
                              VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 </hc:UniformSpacingPanel>
 
-                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,167.622,0,-167.622">
+                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
-                    <TextBlock Text="待办时间*:" Style="{StaticResource LeftTB}"/>
+                    <TextBlock Text="运行方式:"  Style="{StaticResource LeftTB}"/>
-                    <hc:DateTimePicker x:Name="ExeTime" ErrorStr="test"  Width="200"/>
+                    <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Tag="1" Background="{DynamicResource SecondaryRegionBrush}" 
+                         Style="{StaticResource RadioButtonIcon}" Content="指定时间"
+                         IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=1}"/>
+                    <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Background="{DynamicResource SecondaryRegionBrush}"  Tag="2"
+                         Style="{StaticResource RadioButtonIcon}" Content="CRON表达式"
+                         IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=2}"/>
                 </hc:UniformSpacingPanel>
 
-                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,228,0,-228">
+                <hc:UniformSpacingPanel x:Name="SetTimePanel" Visibility="Visible" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                    <TextBlock Text="指定时间:"  Style="{StaticResource LeftTB}"/>
+                    <TextBlock Text="*" Foreground="Red" Margin="-10,0,0,0"/>
+                    <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="-5.2,0,0,0"/>
+                </hc:UniformSpacingPanel>
+
+                <hc:UniformSpacingPanel x:Name="CronPanel" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
+                    <WrapPanel VerticalAlignment="Center">
+                        <TextBlock Text="CRON:"  Style="{StaticResource LeftTB}"/>
+                        <TextBlock Text="*" Foreground="Red" />
+                    </WrapPanel>
+                    <TextBox x:Name="Cron" Width="290" Text="{Binding Cron, Mode=OneWay}" FontSize="14" />
+                </hc:UniformSpacingPanel>
+
+
+
+                <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                     <TextBlock Text="完成时间:"  Style="{StaticResource LeftTB}"/>
-                    <TextBlock x:Name="DoneTime" Width="200"/>
+                    <TextBlock x:Name="DoneTime" Text="{Binding DoneTime, Mode=OneWay}" Width="200"/>
                 </hc:UniformSpacingPanel>
 
 
-                <hc:UniformSpacingPanel Spacing="10" Margin="0,273.333,0,-93.333" Grid.ColumnSpan="4">
+                <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                     <Button Content="保存" Background="#5BC0DE"
                             Foreground="White" Margin="320,6,-208,-10"
                             Click="Save_Button_Click"/>
                 </hc:UniformSpacingPanel>
-            </hc:SimplePanel>
+            </StackPanel>
             <Button Panel.ZIndex="2" Width="22" Height="22" Click="Close_Button_Click" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,10,0"/>
             <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,0"/>
         </Grid>

Control/Windows/ToDoInfoWindow.xaml.cs

@@ -1,6 +1,8 @@
-using GeekDesk.Util;
+using GeekDesk.Constant;
+using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
+using Quartz;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,23 +31,28 @@ namespace GeekDesk.Control.Windows
 
         private AppData appData = MainWindow.appData;
 
-        private ToDoInfo info;
+        //private ToDoInfo info;
 
         private ToDoInfoWindow()
         {
             InitializeComponent();
-            ExeTime.SelectedDateTime = DateTime.Now.AddMinutes(10);
+
             this.Topmost = true;
+            ExeTime.SelectedDateTime = DateTime.Now.AddMinutes(10);
+            SetTimePanel.Visibility = Visibility.Visible;
+            this.DataContext = new ToDoInfo();
         }
         private ToDoInfoWindow(ToDoInfo info)
         {
             InitializeComponent();
             this.Topmost = true;
-            Title.Text = info.Title;
+            this.DataContext = info;
-            Msg.Text = info.Msg;
+            SetTimePanel.Visibility = Visibility.Visible;
-            ExeTime.Text = info.ExeTime;
+            //Title.Text = info.Title;
-            DoneTime.Text = info.DoneTime;
+            //Msg.Text = info.Msg;
-            this.info = info;
+            //ExeTime.Text = info.ExeTime;
+            //DoneTime.Text = info.DoneTime;
+            //this.info = info;
         }
 
 
@@ -79,41 +86,70 @@ namespace GeekDesk.Control.Windows
         /// <param name="e"></param>
         private void Save_Button_Click(object sender, RoutedEventArgs e)
         {
-
             DateTime dt;
-            if (Title.Text.Trim() == "" || ExeTime.Text.Trim() == "")
+            string execTime;
+            TodoTaskExecType execType;
+            if (Title.Text.Trim() == "")
             {
-                Growl.Warning("任务标题 和 待办时间不能为空!");
+                Growl.Warning("任务标题不能为空!");
                 return;
             } else
             {
-                try
+                if (SetTimePanel.Visibility == Visibility.Visible)
                 {
-                    dt = Convert.ToDateTime(ExeTime.Text);
+                    execType = TodoTaskExecType.SET_TIME;
-                } catch (Exception)
+                    if (ExeTime.Text.Trim() == "")
-                {
+                    {
-                    Growl.Warning("请输入正确的时间!");
+                        Growl.Warning("执行时间不能为空!");
-                    return;
+                        return;
+                    }
+                    try
+                    {
+                        dt = Convert.ToDateTime(ExeTime.Text);
+                    }
+                    catch (Exception)
+                    {
+                        Growl.Warning("请输入正确的时间!");
+                        return;
+                    }
+                    execTime = ExeTime.Text;
+                } else {
+                    execType = TodoTaskExecType.CRON;
+                    if (Cron.Text.Trim() == "")
+                    {
+                        Growl.Warning("Cron表达式不能为空!");
+                        return;
+                    }
+                    try
+                    {
+                        bool isValid = CronExpression.IsValidExpression(Cron.Text);
+                        if (!isValid) throw new Exception();
+                    } catch (Exception)
+                    {
+                        Growl.Warning("请输入正确的Cron表达式!");
+                        return;
+                    }
+                    CronExpression exp = new CronExpression(Cron.Text);
+                    DateTime dd = DateTime.Now;
+                    DateTimeOffset ddo = DateTime.SpecifyKind(dd, DateTimeKind.Local);
+                    ddo = (DateTimeOffset)exp.GetNextValidTimeAfter(ddo);
+                    execTime = ddo.LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss");
                 }
             }
-            if (windowType == NEW_TODO)
+            dt = Convert.ToDateTime(execTime);
+            ToDoInfo info = new ToDoInfo
             {
-                info = new ToDoInfo
+                Title = Title.Text,
-                {
+                Msg = Msg.Text,
-                    Title = Title.Text,
+                ExeTime = execTime,
-                    Msg = Msg.Text,
+                ExecType = execType,
-                    ExeTime = ExeTime.Text
+                Cron = Cron.Text
-                };
+            };
-                appData.ToDoList.Add(info);
+            if (windowType != NEW_TODO)
-            } else
             {
-                appData.HiToDoList.Remove(info);
+                appData.HiToDoList.Remove(this.DataContext as ToDoInfo);
-                info.Title = Title.Text;
+            } 
-                info.Msg = Msg.Text;
+            appData.ToDoList.Add(info);
-                info.ExeTime = ExeTime.Text;
-                info.DoneTime = null;
-                appData.ToDoList.Add(info);
-            }
 
             DateTime dtNow = DateTime.Now;
             TimeSpan ts = dt.Subtract(dtNow);
@@ -184,5 +220,21 @@ namespace GeekDesk.Control.Windows
             windowType = DETAIL_TODO;
             window2.Show();
         }
+
+        private void ExecType_Checked(object sender, RoutedEventArgs e)
+        {
+            TodoTaskExecType tag = (TodoTaskExecType)Convert.ToInt32((sender as RadioButton).Tag.ToString());
+            switch (tag)
+            {
+                case TodoTaskExecType.SET_TIME:
+                    SetTimePanel.Visibility = Visibility.Visible;
+                    CronPanel.Visibility = Visibility.Collapsed;
+                    break;
+                default:
+                    CronPanel.Visibility = Visibility.Visible;
+                    SetTimePanel.Visibility = Visibility.Collapsed;
+                    break;
+            }
+        }
     }
 }

Control/Windows/ToDoWindow.xaml.cs

@@ -64,9 +64,11 @@ namespace GeekDesk.Control.Windows
             {
                 case "History":
                     backlog.BacklogList.ItemsSource = appData.HiToDoList;
+                    backlog.type = ToDoType.HISTORY;
                     break;
                 default:
                     backlog.BacklogList.ItemsSource = appData.ToDoList;
+                    backlog.type = ToDoType.NEW;
                     break;
             }
         }

Converts/TodoTaskExecConvert.cs

@@ -0,0 +1,29 @@
+using GeekDesk.Constant;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace GeekDesk.Converts
+{
+   public class TodoTaskExecConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (TodoTaskExecType)value == (TodoTaskExecType)int.Parse(parameter.ToString());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool isChecked = (bool)value;
+            if (!isChecked)
+            {
+                return null;
+            }
+            return (TodoTaskExecType)int.Parse(parameter.ToString());
+        }
+    }
+}

GeekDesk.csproj

@@ -60,16 +60,39 @@
     <Reference Include="HandyControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
       <HintPath>packages\HandyControl.3.1.0\lib\net472\HandyControl.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\System.Drawing.Common.6.0.0-preview.6.21352.12\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
@@ -99,6 +122,7 @@
     <Compile Include="Constant\CommonEnum.cs" />
     <Compile Include="Constant\IconStartType.cs" />
     <Compile Include="Constant\SortType.cs" />
+    <Compile Include="Constant\TodoTaskExecType.cs" />
     <Compile Include="Constant\UpdateType.cs" />
     <Compile Include="Control\Other\BacklogNotificatin.xaml.cs">
       <DependentUpon>BacklogNotificatin.xaml</DependentUpon>
@@ -152,6 +176,7 @@
       <DependentUpon>UpdateWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converts\DoubleToGridLength.cs" />
+    <Compile Include="Converts\TodoTaskExecConvert.cs" />
     <Compile Include="Converts\IntToCornerRadius.cs" />
     <Compile Include="Converts\OpcityConvert.cs" />
     <Compile Include="Converts\UpdateTypeConvert.cs" />

Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2")]
+[assembly: AssemblyVersion("2.3.1.0")]
-[assembly: AssemblyFileVersion("2.2")]
+[assembly: AssemblyFileVersion("2.3.1.0")]

Task/ToDoTask.cs

@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,9 +25,11 @@ namespace GeekDesk.Task
         public static void BackLogCheck()
         {
 
-            System.Timers.Timer timer = new System.Timers.Timer();
+            System.Timers.Timer timer = new System.Timers.Timer
-            timer.Enabled = true;
+            {
-            timer.Interval = 5000;
+                Enabled = true,
+                Interval = 5000
+            };
             timer.Start();
             timer.Elapsed += new System.Timers.ElapsedEventHandler(Check);
         }
@@ -48,9 +51,27 @@ namespace GeekDesk.Task
                         }
                     }
                 }
+                ClearMemory();
             }));
         }
 
+        /// <summary>
+        /// 释放内存
+        /// </summary>
+        public static void ClearMemory()
+        {
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            {
+                SetProcessWorkingSetSize(System.Diagnostics.Process.GetCurrentProcess().Handle, -1, -1);
+            }
+        }
+
+        #region 内存回收
+        [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize")]
+        public static extern int SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize);
+        #endregion
 
 
     }

Update.json

@@ -1,9 +1,9 @@
 {
 	"title" : "<22>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD>",
-	"subTitle" : "V2.2 <20><>ʽ<EFBFBD><CABD>",
+	"subTitle" : "V2.3.10 <20><>ʽ<EFBFBD><CABD>",
 	"msgTitle" : "<22><><EFBFBD>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-	"msg" : "['<27><>Ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><><EFBFBD>ڵ<EFBFBD><EFBFBD>뵭<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݼ<EFBFBD>(Ĭ<><C4AC>Ctrl+Shift+Q)','<27>Ҽ<EFBFBD><D2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD>򿪳<EFBFBD><F2BFAAB3><EFBFBD>Ŀ¼<C4BF>˵<EFBFBD>']",
+	"msg" : "['<27>޸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD>ú<EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؿ<EFBFBD><D8BF>ٵ<EFBFBD><D9B5><EFBFBD><EFBFBD><EFBFBD>','<27>޸<EFBFBD><EFBFBD>޷<EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>BUG','<27><><EFBFBD>Ӷ<EFBFBD>ʱ<EFBFBD>ڴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD>ڿ<EFBFBD>ռ<EFBFBD>ø<EFBFBD>С<EFBFBD><D0A1><EFBFBD>ڴ<EFBFBD>','<27>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ㴰<DAB5>ڵ<EFBFBD>BUG','<27><><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>С','<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>CRON<4F><4E><EFBFBD><EFBFBD>ʽ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><EFBFBD>']",
 	"githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag",
 	"giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases",
-	"version": "2.2"
+	"version": "2.3.10"
 }

Update.json.bak

@@ -0,0 +1,9 @@
+{
+	"title" : "版本更新",
+	"subTitle" : "V2.3 正式版",
+	"msgTitle" : "本次更新内容如下",
+	"msg" : "['边缘吸附功能','窗口淡入淡出动画','待办任务快捷键(默认Ctrl+Shift+Q)','右键任务栏图标打开程序目录菜单']",
+	"githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag",
+	"giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases",
+	"version": "2.3"
+}

Util/GlobalHotKey.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Windows;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Interop;
 
@@ -18,9 +19,7 @@ namespace GeekDesk.Util
         }
 
         private static int currentID;
-        const int WM_HOTKEY = 0x312;
+        private static readonly Dictionary<int, InvisibleWindowForMessages> handleTemp = new Dictionary<int, InvisibleWindowForMessages>();
-        private static Dictionary<int, Window> handleTemp = new Dictionary<int, Window>();
-        public static Dictionary<int, HotKeyCallBackHanlder> callbackTemp = new Dictionary<int, HotKeyCallBackHanlder>();
 
         public delegate void HotKeyCallBackHanlder();
         /// <summary>
@@ -38,50 +37,22 @@ namespace GeekDesk.Util
 
         public static int RegisterHotKey(HotkeyModifiers aModifier, Key key, HotKeyCallBackHanlder callback)
         {
-            Window window = new Window
+            InvisibleWindowForMessages window = new InvisibleWindowForMessages(callback);
-            {
-                WindowStyle = WindowStyle.None,
-                Height = 0,
-                Width = 0,
-                Visibility = Visibility.Collapsed,
-                ShowInTaskbar = false
-            };
-            window.Show();
-            IntPtr handle = new WindowInteropHelper(window).Handle;
-            HwndSource hs = HwndSource.FromHwnd(handle);
-            hs.AddHook(WndProc);
             currentID += 1;
-            if (!RegisterHotKey(handle, currentID, aModifier, (uint)KeyInterop.VirtualKeyFromKey(key)))
+            if (!RegisterHotKey(window.Handle, currentID, aModifier, (uint)KeyInterop.VirtualKeyFromKey(key)))
             {
-                window.Close();
+                window.Dispose();
                 throw new Exception("RegisterHotKey Failed");
             }
             handleTemp.Add(currentID, window);
-            callbackTemp.Add(currentID, callback);
             return currentID;
         }
-        /// <summary>
-        /// 快捷键消息处理
-        /// </summary>
-        static IntPtr WndProc(IntPtr windowHandle, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg == WM_HOTKEY)
-            {
-                int id = wParam.ToInt32();
-                if (callbackTemp.TryGetValue(id, out var callback))
-                {
-                    callback();
-                }
-            }
-            return IntPtr.Zero;
-        }
 
         public static void Dispose(int id)
         {
-            bool test = UnregisterHotKey(new WindowInteropHelper(handleTemp[id]).Handle, id);
+            bool test = UnregisterHotKey(handleTemp[id].Handle, id);
-            GlobalHotKey.handleTemp[id].Close();
+            GlobalHotKey.handleTemp[id].Dispose();
             GlobalHotKey.handleTemp.Remove(id);
-            GlobalHotKey.callbackTemp.Remove(id);
             Console.WriteLine(test);
         }
 
@@ -91,5 +62,31 @@ namespace GeekDesk.Util
         // Unregisters the hot key with Windows.
         [DllImport("user32.dll")]
         private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+
+        private class InvisibleWindowForMessages : NativeWindow, IDisposable
+        {
+            public event HotKeyCallBackHanlder callback;
+            public InvisibleWindowForMessages(HotKeyCallBackHanlder callback)
+            {
+                CreateHandle(new CreateParams());
+                this.callback += callback;
+            } 
+
+            private static readonly int WM_HOTKEY = 0x0312;
+            protected override void WndProc(ref Message m)
+            {
+                base.WndProc(ref m);
+                if (m.Msg == WM_HOTKEY)
+                {
+                    callback();
+                }
+            }
+            public void Dispose()
+            {
+                this.DestroyHandle();
+            }
+        }
+
+
+    }
     }
-}

Util/ImageUtil.cs

@@ -6,6 +6,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Windows;
 using System.Windows.Interop;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace GeekDesk.Util
@@ -22,9 +23,10 @@ namespace GeekDesk.Util
         {
             using (var ms = new System.IO.MemoryStream(array))
             {
-                var image = new BitmapImage();
+                BitmapImage image = new BitmapImage();
                 image.BeginInit();
                 image.CacheOption = BitmapCacheOption.OnLoad; // here
+                RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.LowQuality);
                 image.StreamSource = ms;
                 image.EndInit();
                 return image;
@@ -184,7 +186,7 @@ namespace GeekDesk.Util
                     Bitmap bmpOut = new Bitmap(lnNewWidth, lnNewHeight);
                     Graphics g = Graphics.FromImage(bmpOut);
                     g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
-                    g.FillRectangle(Brushes.White, 0, 0, lnNewWidth, lnNewHeight);
+                    g.FillRectangle(System.Drawing.Brushes.White, 0, 0, lnNewWidth, lnNewHeight);
                     g.DrawImage(loBMP, 0, 0, lnNewWidth, lnNewHeight);
                     loBMP.Dispose();
                     string tempPath = Constants.APP_DIR + "\\temp";
@@ -211,6 +213,7 @@ namespace GeekDesk.Util
             BitmapImage bmImg = new BitmapImage();
             bmImg.BeginInit();
             bmImg.CacheOption = BitmapCacheOption.OnLoad;
+            RenderOptions.SetBitmapScalingMode(bmImg, BitmapScalingMode.LowQuality);
             using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))
             {
                 bmImg.StreamSource = fs;

Util/MarginHide.cs

@@ -25,10 +25,12 @@ namespace GeekDesk.Util
     {
         readonly Window window;//定义使用该方法的窗体
 
-        private readonly int hideTime = 150;
+        private readonly int hideTime = 80;
 
         private readonly int taskTime = 200;
 
+        private double showMarginWidth = 1;
+
         private bool isHide;
 
         public Timer timer;
@@ -89,39 +91,39 @@ namespace GeekDesk.Util
                 //上方隐藏条件
                 if (windowTop <= screenTop)
                 {
-                    HideAnimation(windowTop, screenTop - windowHeight + 1, Window.TopProperty);
+                    HideAnimation(windowTop, screenTop - windowHeight + showMarginWidth, Window.TopProperty);
                     isHide = true;
                     return;
                 }
                 //左侧隐藏条件
                 if (windowLeft <= screenLeft)
                 {
-                    HideAnimation(windowLeft, screenLeft - windowWidth + 1, Window.LeftProperty);
+                    HideAnimation(windowLeft, screenLeft - windowWidth + showMarginWidth, Window.LeftProperty);
                     return;
                 }
                 //右侧隐藏条件
                 if (windowLeft + windowWidth + Math.Abs(screenLeft) >= screenWidth)
                 {
-                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - 1, Window.LeftProperty);
+                    HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - showMarginWidth, Window.LeftProperty);
                     return;
                 }
             } else if (mouseX >= windowLeft && mouseX <= windowLeft + windowWidth 
                 && mouseY >= windowTop && mouseY <= windowTop + windowHeight)
             {
                 //上方显示
-                if (windowTop <= screenTop - 1)
+                if (windowTop <= screenTop - showMarginWidth)
                 {
                     HideAnimation(windowTop, screenTop, Window.TopProperty);
                     return;
                 }
                 //左侧显示
-                if (windowLeft <= screenLeft -1)
+                if (windowLeft <= screenLeft - showMarginWidth)
                 {
                     HideAnimation(windowLeft, screenLeft, Window.LeftProperty);
                     return;
                 }
                 //右侧显示
-                if (windowLeft + Math.Abs(screenLeft) == screenWidth -1)
+                if (windowLeft + Math.Abs(screenLeft) == screenWidth - showMarginWidth)
                 {
                     HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty);
                     return;
@@ -134,6 +136,7 @@ namespace GeekDesk.Util
 
         public void TimerSet()
         {
+            if (timer != null) return;
             timer = new Timer();//添加timer计时器，隐藏功能
             #region 计时器设置，隐藏功能
             timer.Interval = taskTime;
@@ -145,6 +148,8 @@ namespace GeekDesk.Util
         public void TimerStop()
         {
             timer.Stop();
+            timer.Dispose();
+            timer = null;
             //功能关闭 如果界面是隐藏状态  那么要显示界面 ↓
 
             double screenLeft = SystemParameters.VirtualScreenLeft;
@@ -157,21 +162,21 @@ namespace GeekDesk.Util
             double windowLeft = window.Left;
 
             //左侧显示
-            if (windowLeft <= screenLeft - 1)
+            if (windowLeft <= screenLeft - showMarginWidth)
             {
                 HideAnimation(windowLeft, screenLeft, Window.LeftProperty);
                 return;
             }
 
             //上方显示
-            if (windowTop <= screenTop - 1)
+            if (windowTop <= screenTop - showMarginWidth)
             {
                 HideAnimation(windowTop, screenTop, Window.TopProperty);
                 return;
             }
 
             //右侧显示
-            if (windowLeft + Math.Abs(screenLeft) == screenWidth - 1)
+            if (windowLeft + Math.Abs(screenLeft) == screenWidth - showMarginWidth)
             {
                 HideAnimation(windowLeft, screenWidth - Math.Abs(screenLeft) - windowWidth, Window.LeftProperty);
                 return;
@@ -191,7 +196,7 @@ namespace GeekDesk.Util
             {
                 window.BeginAnimation(property, null);
             };
-            Timeline.SetDesiredFrameRate(da, 30);
+            Timeline.SetDesiredFrameRate(da, 60);
             window.BeginAnimation(property, da);
         }
     }

ViewModel/AppConfig.cs

@@ -61,13 +61,89 @@ namespace GeekDesk.ViewModel
         private string textColor = "#000000"; //字体颜色
         private double imgPanelWidth = (double)CommonEnum.IMAGE_PANEL_WIDTH;
         private double imgPanelHeight = (double)CommonEnum.IMAGE_PANEL_HEIGHT;
-
         private bool marginHide = false; //贴边隐藏
-
         private bool appAnimation = false; //主窗口动画效果
-
+        private int imageWidth = (int)CommonEnum.IMAGE_WIDTH; //图片宽度
+        private int imageHeight = (int)CommonEnum.IMAGE_HEIGHT; //图片高度
 
         #region GetSet
+        public int ImageWidth
+        {
+            get
+            {
+                // 为了兼容旧版 暂时使用默认
+                if (imageWidth == 0)
+                {
+                    return (int)CommonEnum.IMAGE_WIDTH;
+                } else
+                {
+                    return imageWidth;
+                }
+                
+            }
+            set
+            {
+                imageWidth = value;
+                //同时设置高度
+                ImageHeight = value;
+                
+
+                //计算 容器宽度因子
+                double i = ((double)imageWidth - (double)CommonEnum.IMAGE_WIDTH) / 5d;
+                double s = 2.44;
+                i *= 2d;
+                while (i > 1)
+                {
+                    i /= 10d;
+                }
+                
+                if (i > 0d)
+                {
+                    s -= i;
+                }
+                //设置容器宽度
+                ImgPanelWidth = (int)(ImageWidth * s);
+
+                OnPropertyChanged("ImageWidth");
+            }
+        }
+
+        public int ImageHeight
+        {
+            get
+            {
+                //都使用宽度来确定大小
+                // 为了兼容旧版 暂时使用默认
+                if (imageHeight == 0)
+                {
+                    return (int)CommonEnum.IMAGE_HEIGHT;
+                }
+                else
+                {
+                    return imageHeight;
+                }
+            }
+            set
+            {
+                imageHeight = value;
+
+                //计算容器高度因子
+                double i = ((double)imageHeight - (double)CommonEnum.IMAGE_HEIGHT) / 5d;
+                while (i > 1)
+                {
+                    i /= 10d;
+                }
+                double s = 2.00;
+                if (i > 0d)
+                {
+                    s -= i;
+                }
+
+                //设置容器高度
+                ImgPanelHeight = ImageHeight * s;
+                OnPropertyChanged("ImageHeight");
+            }
+        }
 
         public bool AppAnimation
         {

ViewModel/IconInfo.cs

@@ -20,8 +20,6 @@ namespace GeekDesk.ViewModel
         private BitmapImage bitmapImage; //位图
         private byte[] imageByteArr; //图片 byte数组
         private string content; //显示信息
-        private int imageWidth = (int)CommonEnum.IMAGE_WIDTH; //图片宽度
-        private int imageHeight = (int)CommonEnum.IMAGE_HEIGHT; //图片高度
         private bool adminStartUp = false; //始终管理员方式启动  默认否
         private byte[] defaultImage; //默认图标
 
@@ -152,33 +150,7 @@ namespace GeekDesk.ViewModel
             }
         }
 
-        public int ImageWidth
+       
-        {
-            get
-            {
-                // 为了兼容旧版 暂时使用默认
-                return (int)CommonEnum.IMAGE_WIDTH;
-            }
-            set
-            {
-                imageWidth = value;
-                OnPropertyChanged("ImageWidth");
-            }
-        }
-
-        public int ImageHeight
-        {
-            get
-            {
-                // 为了兼容旧版 暂时使用默认
-                return (int)CommonEnum.IMAGE_HEIGHT;
-            }
-            set
-            {
-                imageHeight = value;
-                OnPropertyChanged("ImageHeight");
-            }
-        }
 
 
 

ViewModel/ToDoInfo.cs

@@ -1,4 +1,5 @@
-using GeekDesk.Util;
+using GeekDesk.Constant;
+using GeekDesk.Util;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,8 +18,38 @@ namespace GeekDesk.ViewModel
         private string msg;  //事项详情
         private string exeTime;  //待办时间
         private string doneTime; //完成时间
+        private TodoTaskExecType execType = TodoTaskExecType.SET_TIME;
+        private string cron;  //cron表达式
         //private int status;  //状态 0 未处理  1 已处理
 
+        public string Cron
+        {
+            get
+            {
+                return cron;
+            }
+            set
+            {
+                cron = value;
+                OnPropertyChanged("Cron");
+            }
+        }
+
+
+        public TodoTaskExecType ExecType
+        {
+            get
+            {
+                //兼容老版本 需要给个默认值
+                if (execType == 0) return TodoTaskExecType.SET_TIME;
+                return execType;
+            }
+            set
+            {
+                execType = value;
+                OnPropertyChanged("ExecType");
+            }
+        }
 
         public string DoneTime
         {

packages.config

@@ -2,6 +2,13 @@
 <packages>
   <package id="CommonServiceLocator" version="2.0.6" targetFramework="net452" requireReinstallation="true" />
   <package id="HandyControl" version="3.1.0" targetFramework="net472" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="Quartz" version="3.3.3" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />
   <package id="System.Drawing.Common" version="6.0.0-preview.6.21352.12" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net472" />
 </packages>