bugs fixed

dimojang · dimojang · commit adb6ebbd8b9d · 2020-08-08T16:55:39.000+08:00
diff --git a/Classes/MyAppData.cs b/Classes/MyAppData.cs
@@ -155,7 +155,7 @@ public string StoragePath
         /// </summary>
         public void Save()
         {
-            string savePath = StoragePath + (StoragePath.EndsWith("//") ? "" : "//") + DateTime.Today.ToString("yyyyMMdd") + ".json";
+            string savePath = StoragePath + (StoragePath.EndsWith("\\") ? "" : "\\") + DateTime.Today.ToString("yyyyMMdd") + ".json";
             string Content = MyDataHelper.CoverObjectToJson(AllDays[DateTime.Today]);
 
             MyDataHelper.WriteFile(savePath, Content);
@@ -169,7 +169,7 @@ public void Load(DateTime LoadDate)
         {
             try
             {
-                string loadPath = StoragePath + (StoragePath.EndsWith("//") ? "" : "//") + LoadDate.ToString("yyyyMMdd") + ".json";
+                string loadPath = StoragePath + (StoragePath.EndsWith("\\") ? "" : "\\") + LoadDate.ToString("yyyyMMdd") + ".json";
                 string Json = MyDataHelper.ReadFile(loadPath);
 
                 if (!AllDays.ContainsKey(LoadDate))
diff --git a/Classes/MyDay.cs b/Classes/MyDay.cs
@@ -25,37 +25,34 @@ public class MyDay
         /// &#33719;&#21462;&#20170;&#26085;&#23567;&#32467;&#65292;&#21363;&#20026;&#26102;&#38388;&#32447;&#20869;&#30456;&#21516;&#36719;&#20214;&#20351;&#29992;&#26102;&#38388;&#21512;&#24182;&#21518;&#30340;&#21015;&#34920;
         /// </summary>
         /// <returns>&#20170;&#26085;&#23567;&#32467; - Dictionary<string, TimeSpan></returns>
-        public Dictionary<string, Software> OverView 
-        { 
-            get
+        public Dictionary<string, Software> GetOverView()
+        {
+            Dictionary<string, Software> overView = new Dictionary<string, Software>();
+
+            foreach (MyTimeDuration item in TimeLine)
             {
-                Dictionary<string, Software> overView = new Dictionary<string, Software>();
+                string nowAppName = item.TimeDurationTask.ApplicationName;
+                if (string.IsNullOrEmpty(nowAppName)) continue;
+
+                TimeSpan duration = item.Duration;
 
-                foreach (MyTimeDuration item in TimeLine)
+                if (overView.ContainsKey(nowAppName))
+                    overView[nowAppName].Duration += duration;
+                else
                 {
-                    string nowAppName = item.TimeDurationTask.ApplicationName;
-                    if (string.IsNullOrEmpty(nowAppName)) continue;
-
-                    TimeSpan duration = item.Duration;
-
-                    if (overView.ContainsKey(nowAppName))
-                        overView[nowAppName].Duration += duration;
-                    else
-                    {
-                        Software result =
-                            new Software()
-                            {
-                                Duration = item.Duration,
-                                Name = nowAppName,
-                                Icon = MyDataHelper.BitmapToBitmapImage(
-                                    MyDataHelper.Base64StringToImage(item.TimeDurationTask.ApplicationIcon_Base64))
-                            };
-                        overView.Add(nowAppName, result);
-                    }
+                    Software result =
+                        new Software()
+                        {
+                            Duration = item.Duration,
+                            Name = nowAppName,
+                            Icon = MyDataHelper.BitmapToBitmapImage(
+                                MyDataHelper.Base64StringToImage(item.TimeDurationTask.ApplicationIcon_Base64))
+                        };
+                    overView.Add(nowAppName, result);
                 }
-
-                return overView;
             }
+
+            return overView;
         }
     }
 
diff --git a/ViewModels/MainPageViewModel.cs b/ViewModels/MainPageViewModel.cs
@@ -81,7 +81,7 @@ private void Timer_Tick(object sender, EventArgs e)
             if (!((App)Application.Current).appData.AllDays.ContainsKey(displayDate))
                 ((App)Application.Current).appData.Load(displayDate);
 
-            Overview = PrintOverview(((App)Application.Current).appData.AllDays[displayDate].OverView);
+            Overview = PrintOverview(((App)Application.Current).appData.AllDays[displayDate].GetOverView());
             SourceData = PrintSourceData(((App)Application.Current).appData.AllDays[displayDate].TimeLine);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public string StoragePath`
`155`	`155`	`/// </summary>`
`156`	`156`	`public void Save()`
`157`	`157`	`{`
`158`		`- string savePath = StoragePath + (StoragePath.EndsWith("//") ? "" : "//") + DateTime.Today.ToString("yyyyMMdd") + ".json";`
	`158`	`+ string savePath = StoragePath + (StoragePath.EndsWith("\\") ? "" : "\\") + DateTime.Today.ToString("yyyyMMdd") + ".json";`
`159`	`159`	`string Content = MyDataHelper.CoverObjectToJson(AllDays[DateTime.Today]);`
`160`	`160`
`161`	`161`	`MyDataHelper.WriteFile(savePath, Content);`
`@@ -169,7 +169,7 @@ public void Load(DateTime LoadDate)`
`169`	`169`	`{`
`170`	`170`	`try`
`171`	`171`	`{`
`172`		`- string loadPath = StoragePath + (StoragePath.EndsWith("//") ? "" : "//") + LoadDate.ToString("yyyyMMdd") + ".json";`
	`172`	`+ string loadPath = StoragePath + (StoragePath.EndsWith("\\") ? "" : "\\") + LoadDate.ToString("yyyyMMdd") + ".json";`
`173`	`173`	`string Json = MyDataHelper.ReadFile(loadPath);`
`174`	`174`
`175`	`175`	`if (!AllDays.ContainsKey(LoadDate))`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private void Timer_Tick(object sender, EventArgs e)`
`81`	`81`	`if (!((App)Application.Current).appData.AllDays.ContainsKey(displayDate))`
`82`	`82`	`((App)Application.Current).appData.Load(displayDate);`
`83`	`83`
`84`		`- Overview = PrintOverview(((App)Application.Current).appData.AllDays[displayDate].OverView);`
	`84`	`+ Overview = PrintOverview(((App)Application.Current).appData.AllDays[displayDate].GetOverView());`
`85`	`85`	`SourceData = PrintSourceData(((App)Application.Current).appData.AllDays[displayDate].TimeLine);`
`86`	`86`	`}`
`87`	`87`