[1.0.4.4]电池增量现在支持实时模式了。

LeoChen98 · May 15, 2019 · 8cc6874 · 8cc6874
1 parent 94b0d5d
commit 8cc6874
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 32 deletions.
diff --git a/BiliUPDesktopTool/Class/BiliUPData.cs b/BiliUPDesktopTool/Class/BiliUPData.cs
@@ -545,7 +545,7 @@ public class Video : INotifyPropertyChanged
 
             private int _coin, _coin_incr, _dm, _dm_incr, _fan, _fan_incr, _fav, _fav_incr, _like, _like_incr, _play, _play_incr, _share, _share_incr, _comment, _comment_incr;
             private int _coin_real, _coin_real_last, _dm_real, _dm_real_last, _fav_real, _fav_real_last, _like_real, _like_real_last, _play_real, _play_real_last, _share_real, _share_real_last, _comment_real, _comment_real_last;
-            private double _elec, _elec_incr, _growup, _growup_incr;
+            private double _elec, _elec_last, _elec_incr, _growup, _growup_incr;
             private DateTime? LastTime = null;
 
             #endregion Private Fields
@@ -725,7 +725,16 @@ public double elec
             /// </summary>
             public double elec_incr
             {
-                get { return _elec_incr; }
+                get {
+                    if (Bas.settings.IsRealTime)
+                    {
+                        return _elec - _elec_last + _elec_incr;
+                    }
+                    else
+                    {
+                        return _elec_incr;
+                    }
+                }
                 set
                 {
                     _elec_incr = value;
@@ -1112,6 +1121,7 @@ private void GetRealTime()
                     _play_real_last = 0;
                     _share_real_last = 0;
                     _comment_real_last = 0;
+                    _elec_last = GetCharge();
                 }
                 bool IsChangeLast = false;
                 string str = Bas.GetHTTPBody("https://member.bilibili.com/x/web/archives?status=is_pubing%2Cpubed%2Cnot_pubed&pn=1&ps=10&coop=1", Bas.account.Cookies, "https://member.bilibili.com/v2");

diff --git a/BiliUPDesktopTool/DataDesc.json b/BiliUPDesktopTool/DataDesc.json
@@ -17,6 +17,6 @@
     "like": "点赞。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
     "fan": "实时粉丝数。（实时更新，不受“实时模式”开关状态的影响）",
     "growup": "创作激励计划。（每天凌晨更新，不受“实时模式”开关状态的影响）",
-    "elec": "充电计划电池。（实时更新，不受“实时模式”开关状态的影响）"
+    "elec": "充电计划电池。（实时更新，实时模式下显示昨日增量+程序运行时增量，非实时模式显示实时电池数据和前一天增量）"
   }
 }
diff --git a/BiliUPDesktopTool/Properties/AssemblyInfo.cs b/BiliUPDesktopTool/Properties/AssemblyInfo.cs
@@ -47,6 +47,6 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.3")]
-[assembly: AssemblyFileVersion("1.0.3.3")]
+[assembly: AssemblyVersion("1.0.4.4")]
+[assembly: AssemblyFileVersion("1.0.4.4")]
 [assembly: Guid("B31C3B29-E506-4603-9F46-CF7106B77116")]
diff --git a/BiliUPDesktopTool/Properties/Resources.Designer.cs b/BiliUPDesktopTool/Properties/Resources.Designer.cs
diff --git a/BiliUPDesktopTool/Properties/Resources.resx b/BiliUPDesktopTool/Properties/Resources.resx
@@ -120,24 +120,24 @@
   <data name="DataDesc" xml:space="preserve">
     <value>{
   "article": {
-    "view": "文章点击量。（实时模式下显示昨日增量+程序运行时增量）",
-    "coin": "硬币。（实时模式下显示昨日增量+程序运行时增量）",
-    "reply": "评论。（实时模式下显示昨日增量+程序运行时增量）",
-    "fav": "收藏。（实时模式下显示昨日增量+程序运行时增量）",
-    "like": "点赞。（实时模式下显示昨日增量+程序运行时增量）",
-    "share": "分享数。（实时模式下显示昨日增量+程序运行时增量）"
+    "view": "文章点击量。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "coin": "硬币。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "reply": "评论。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "fav": "收藏。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "like": "点赞。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "share": "分享数。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）"
   },
   "video": {
-    "play": "视频播放数。（实时模式下显示昨日增量+程序运行时增量）",
-    "coin": "硬币。（实时模式下显示昨日增量+程序运行时增量）",
-    "comment": "评论。（实时模式下显示昨日增量+程序运行时增量）",
-    "dm": "弹幕。（实时模式下显示昨日增量+程序运行时增量）",
-    "fav": "收藏。（实时模式下显示昨日增量+程序运行时增量）",
-    "share": "分享数。（实时模式下显示昨日增量+程序运行时增量）",
-    "like": "点赞。（实时模式下显示昨日增量+程序运行时增量）",
-    "fan": "实时粉丝数。（不受“实时模式”开关状态的影响）",
+    "play": "视频播放数。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "coin": "硬币。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "comment": "评论。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "dm": "弹幕。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "fav": "收藏。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "share": "分享数。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "like": "点赞。（每天中午12点更新昨日数据，实时模式下显示昨日增量+程序运行时增量）",
+    "fan": "实时粉丝数。（实时更新，不受“实时模式”开关状态的影响）",
     "growup": "创作激励计划。（每天凌晨更新，不受“实时模式”开关状态的影响）",
-    "elec": "充电计划电池。（不受“实时模式”开关状态的影响）"
+    "elec": "充电计划电池。（实时更新，实时模式下显示昨日增量+程序运行时增量，非实时模式显示实时电池数据和前一天增量）"
   }
 }</value>
     <comment>数据描述</comment>