[2.0.0.15 Preview 7]紧急修复头像为空导致的错误。

LeoChen98 · Dec 12, 2019 · f0962ea · f0962ea
1 parent 2d6ba7c
commit f0962ea
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 23 deletions.
diff --git a/BiliUPDesktopTool/Class/Bas.cs b/BiliUPDesktopTool/Class/Bas.cs
@@ -18,12 +18,12 @@ internal class Bas
         /// <summary>
         /// 主程序Build
         /// </summary>
-        public const int _Build = 14;
+        public const int _Build = 15;
 
         /// <summary>
         /// 主程序版本号
         /// </summary>
-        public const string _Version = "2.0.0.14 Preview 6";
+        public const string _Version = "2.0.0.15 Preview 7";
 
         #endregion Public Fields
 

diff --git a/BiliUPDesktopTool/Class/BiliUPData.cs b/BiliUPDesktopTool/Class/BiliUPData.cs
@@ -15,17 +15,6 @@ namespace BiliUPDesktopTool
     /// </summary>
     internal class BiliUPData
     {
-        private static BiliUPData intance;
-
-        public static BiliUPData Intance
-        {
-            get
-            {
-                if (intance == null) intance = new BiliUPData();
-                return intance;
-            }
-        }
-
         #region Public Fields
 
         /// <summary>
@@ -42,6 +31,8 @@ public static BiliUPData Intance
 
         #region Private Fields
 
+        private static BiliUPData intance;
+
         /// <summary>
         /// 指示是否正在刷新数据。
         /// </summary>
@@ -54,7 +45,7 @@ public static BiliUPData Intance
 
         #endregion Private Fields
 
-        #region Public Constructors
+        #region Private Constructors
 
         /// <summary>
         /// 初始化up主数据
@@ -67,7 +58,20 @@ private BiliUPData()
             Refresher = new Timer((o) => { Refresh(); }, null, 0, Settings.Instance.DataRefreshInterval);
         }
 
-        #endregion Public Constructors
+        #endregion Private Constructors
+
+        #region Public Properties
+
+        public static BiliUPData Intance
+        {
+            get
+            {
+                if (intance == null) intance = new BiliUPData();
+                return intance;
+            }
+        }
+
+        #endregion Public Properties
 
         #region Public Methods
 
@@ -667,10 +671,10 @@ public class Video : INotifyPropertyChanged
         {
             #region Private Fields
 
+            private DateTime? ChargeLastTime = null;
             private Data data;
 
             private DateTime? LastTime = null;
-            private DateTime? ChargeLastTime = null;
 
             #endregion Private Fields
 

diff --git a/BiliUPDesktopTool/Helper/ValueConvertHelper.cs b/BiliUPDesktopTool/Helper/ValueConvertHelper.cs
@@ -114,7 +114,9 @@ public class IsNullConverter : IValueConverter
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return (string.IsNullOrEmpty(value.ToString()));
+            if (value == null || string.IsNullOrEmpty(value.ToString()))
+                return true;
+            else return false;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/BiliUPDesktopTool/Plug-ins/PluginStore.cs b/BiliUPDesktopTool/Plug-ins/PluginStore.cs
@@ -17,13 +17,17 @@ public static PluginInfo_Online[] GetList()
 
         public class PluginInfo_Online
         {
-            public string name;
+            #region Public Fields
+
             public string description;
-            public int version;
-            public string version_str;
+            public string hash;
+            public string name;
             public DateTime updatetime;
             public string url;
-            public string hash;
+            public int version;
+            public string version_str;
+
+            #endregion Public Fields
         }
 
         #endregion Public Classes

diff --git a/BiliUPDesktopTool/Properties/AssemblyInfo.cs b/BiliUPDesktopTool/Properties/AssemblyInfo.cs
@@ -47,6 +47,6 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.14")]
-[assembly: AssemblyFileVersion("2.0.0.14")]
+[assembly: AssemblyVersion("2.0.0.15")]
+[assembly: AssemblyFileVersion("2.0.0.15")]
 [assembly: Guid("B31C3B29-E506-4603-9F46-CF7106B77116")]