From 09d3a520b445bddfc3a7781fa99cf0e3411ea8fc Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Thu, 23 Dec 2021 13:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcron=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=E5=BE=85=E5=8A=9E=20=E6=97=A0=E9=99=90=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Other/BacklogNotificatin.xaml.cs      | 14 ++++++++------
 Control/UserControls/ToDo/TodoControl.xaml    |  3 +--
 Control/UserControls/ToDo/TodoControl.xaml.cs | 15 ---------------
 Resource/Dictionary/CommonStyle.xaml          | 19 ++++++++++---------
 4 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/Control/Other/BacklogNotificatin.xaml.cs b/Control/Other/BacklogNotificatin.xaml.cs
index b00460d..6e3cbff 100644
--- a/Control/Other/BacklogNotificatin.xaml.cs
+++ b/Control/Other/BacklogNotificatin.xaml.cs
@@ -40,13 +40,15 @@ namespace GeekDesk.Control.Other
             if (info.ExecType == TodoTaskExecType.CRON)
             {
                 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 nowTime = DateTime.Now;
 
-                DateTime nextTime = ddo.LocalDateTime;
-                TimeSpan ts = nextTime.Subtract(dtNow);
+                //计算下次执行时间
+                DateTime nextTime = DateTime.SpecifyKind(exp.GetNextValidTimeAfter(nowTime).Value.LocalDateTime, DateTimeKind.Local);
+
+                string nextTimeStr = nextTime.ToString("yyyy-MM-dd HH:mm:ss");
+                info.ExeTime = nextTimeStr;
+
+                TimeSpan ts = nextTime.Subtract(nowTime);
                 int minutes = (int)Math.Ceiling(ts.TotalMinutes);
                 if (minutes < 0)
                 {
diff --git a/Control/UserControls/ToDo/TodoControl.xaml b/Control/UserControls/ToDo/TodoControl.xaml
index f614252..6c92c02 100644
--- a/Control/UserControls/ToDo/TodoControl.xaml
+++ b/Control/UserControls/ToDo/TodoControl.xaml
@@ -27,11 +27,10 @@
                 <DataGrid.RowStyle>
                     <Style TargetType="DataGridRow" BasedOn="{StaticResource DataGridRowStyle}">
                         <EventSetter Event="MouseRightButtonDown" Handler="DataGridRow_MouseRightButtonDown" />
-                        <EventSetter Event="Selected" Handler="DataGridRow_Selected"/>
                         <Setter Property="Background" Value="White"/>
                         <Style.Triggers>
                             <Trigger Property="IsSelected" Value="True">
-                                <Setter Property="Background" Value="#5BC0DE"/>
+                                <Setter Property="Background" Value="{StaticResource BtnBG}"/>
                             </Trigger>
                             <Trigger Property="IsSelected" Value="False">
                                 <Setter Property="Background" Value="White"/>
diff --git a/Control/UserControls/ToDo/TodoControl.xaml.cs b/Control/UserControls/ToDo/TodoControl.xaml.cs
index 7957a0a..0922b07 100644
--- a/Control/UserControls/ToDo/TodoControl.xaml.cs
+++ b/Control/UserControls/ToDo/TodoControl.xaml.cs
@@ -84,20 +84,5 @@ namespace GeekDesk.Control.UserControls.Backlog
             Menu.IsOpen = true;
         }
 
-        /// <summary>
-        /// 选中时颜色变化
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DataGridRow_Selected(object sender, RoutedEventArgs e)
-        {
-            Color c = Color.FromRgb(91, 192, 222);
-            SolidColorBrush b = new SolidColorBrush
-            {
-                Color = c,
-                Opacity = 0.9
-            };
-            ((DataGridRow)sender).Background = b;
-        }
     }
 }
diff --git a/Resource/Dictionary/CommonStyle.xaml b/Resource/Dictionary/CommonStyle.xaml
index c3e5ef5..295f4df 100644
--- a/Resource/Dictionary/CommonStyle.xaml
+++ b/Resource/Dictionary/CommonStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:hc="https://handyorg.github.io/handycontrol">
 
 
+    <!--整体样式-->
     <Style x:Key="BorderBG" TargetType="Border">
         <Style.Setters>
             <Setter Property="Background">
@@ -18,18 +19,18 @@
         </Style.Setters>
     </Style>
 
+    <LinearGradientBrush x:Key="BtnBG" Opacity="0.97">
+        <GradientStop Color="#84fab0" Offset="0"/>
+        <GradientStop Color="#8fd3f4" Offset="1"/>
+    </LinearGradientBrush>
+
+    <!--按钮样式-->
     <Style x:Key="Btn1" TargetType="Button" BasedOn="{StaticResource ButtonInfo}">
-        <Setter Property="Background">
-            <Setter.Value>
-                <LinearGradientBrush Opacity="0.97">
-                    <GradientStop Color="#5BC0DE" Offset="0"/>
-                    <GradientStop Color="#5BC0DE" Offset="1"/>
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Background" Value="{StaticResource BtnBG}"/>
+        <Setter Property="Foreground" Value="Gray"/>
     </Style>
 
+    <!--菜单样式-->
     <Style x:Key="MyMenuStyle" TargetType="hc:SideMenuItem" BasedOn="{StaticResource SideMenuItemBaseStyle}">
         <Style.Setters>
             <Setter Property="Background" Value="Transparent"/>