Merge pull request #980 from BeyondDimension/develop

AigioL · web-flow · commit a50324324342 · 2022-02-07T11:04:36.000+08:00
v2.6.5 RC4
diff --git a/src/AboutAppInfoPopup.cs b/src/AboutAppInfoPopup.cs
@@ -414,18 +414,18 @@ static string GetJavaSystemGetProperty(string propertyKey)
                 //    b.Append(DeviceSecurityCheckUtil.IsEmulator.ToLowerString());
                 //    b.AppendLine();
                 //}
-                b.Append("[device.gl.renderer] ");
-                b.Append(GLES20.GlGetString(GLES20.GlRenderer) ?? "");
-                b.AppendLine();
-                b.Append("[device.gl.vendor] ");
-                b.Append(GLES20.GlGetString(GLES20.GlVendor) ?? "");
-                b.AppendLine();
-                b.Append("[device.gl.version] ");
-                b.Append(GLES20.GlGetString(GLES20.GlVersion) ?? "");
-                b.AppendLine();
-                b.Append("[device.gl.extensions] ");
-                b.Append(GLES20.GlGetString(GLES20.GlExtensions) ?? "");
-                b.AppendLine();
+                //b.Append("[device.gl.renderer] ");
+                //b.Append(GLES20.GlGetString(GLES20.GlRenderer) ?? "");
+                //b.AppendLine();
+                //b.Append("[device.gl.vendor] ");
+                //b.Append(GLES20.GlGetString(GLES20.GlVendor) ?? "");
+                //b.AppendLine();
+                //b.Append("[device.gl.version] ");
+                //b.Append(GLES20.GlGetString(GLES20.GlVersion) ?? "");
+                //b.AppendLine();
+                //b.Append("[device.gl.extensions] ");
+                //b.Append(GLES20.GlGetString(GLES20.GlExtensions) ?? "");
+                //b.AppendLine();
                 b.Append("[device.biometric] ");
                 b.Append(IBiometricService.Instance.IsSupportedAsync().Result.ToLowerString());
                 b.AppendLine();
diff --git a/src/Common.ClientLib.Droid/Application/Security/DeviceSecurityCheckUtil.cs b/src/Common.ClientLib.Droid/Application/Security/DeviceSecurityCheckUtil.cs
@@ -267,23 +267,28 @@
 //                        newRating++;
 //                    }
 
-//                    try
-//                    {
-//                        var opengl = Android.Opengl.GLES20.GlGetString(Android.Opengl.GLES20.GlRenderer);
-//                        if (!string.IsNullOrWhiteSpace(opengl))
-//                        {
-//#pragma warning disable CS8604 // 可能的 null 引用参数。
-//                            if (contains(opengl, "Bluestacks") ||
-//                                contains(opengl, "Translator") ||
-//                                contains(opengl, "youwave")
-//                            )
-//#pragma warning restore CS8604 // 可能的 null 引用参数。
-//                                newRating += 10;
-//                        }
-//                    }
-//                    catch
-//                    {
-//                    }
+/* signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xdd0
+ * Cause: null pointer dereference
+ * backtrace:
+ * #00 pc 0000000000005ff4  /system/lib64/libGLESv1_CM.so (glGetString+52)
+ */
+////                    try
+////                    {
+////                        var opengl = Android.Opengl.GLES20.GlGetString(Android.Opengl.GLES20.GlRenderer);
+////                        if (!string.IsNullOrWhiteSpace(opengl))
+////                        {
+////#pragma warning disable CS8604 // 可能的 null 引用参数。
+////                            if (contains(opengl, "Bluestacks") ||
+////                                contains(opengl, "Translator") ||
+////                                contains(opengl, "youwave")
+////                            )
+////#pragma warning restore CS8604 // 可能的 null 引用参数。
+////                                newRating += 10;
+////                        }
+////                    }
+////                    catch
+////                    {
+////                    }
 
 //                    try
 //                    {
diff --git a/src/Common.ClientLib/Application/Services/Implementation/PreferencesPlatformServiceImpl.cs b/src/Common.ClientLib/Application/Services/Implementation/PreferencesPlatformServiceImpl.cs
@@ -2,9 +2,7 @@
 using System.Application.Entities;
 using System.Application.Repositories;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using NotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 using SQLiteNotNull = SQLite.NotNullAttribute;
 using SQLiteTable = SQLite.TableAttribute;
 
@@ -26,93 +24,33 @@ static string GetId(string key, string? sharedName)
             if (sharedName == null) return GetId(key);
             return $"{key}_{sharedName}_S";
         }
-
         public void PlatformClear(string? sharedName)
         {
-            if (sharedName == null)
-            {
-                conn.Execute(Sql_Delete_All);
-            }
-            else
-            {
-                conn.Execute(Sql_Delete_Where_SharedName_Equals, sharedName);
-            }
+            conn.Execute(Sql_Delete_Where_SharedName_Equals, sharedName ?? string.Empty);
         }
 
-        //public void PlatformClear(string? sharedName)
-        //{
-        //    if (sharedName == null)
-        //    {
-        //        conn.DeleteAll<Entity>();
-        //    }
-        //    else
-        //    {
-        //        var items = conn.Table<Entity>().Where(x => x.SharedName == sharedName).ToArray();
-        //        foreach (var item in items)
-        //        {
-        //            conn.Delete(item);
-        //        }
-        //    }
-        //}
-
-        //public bool PlatformContainsKey(string key, string? sharedName)
-        //{
-        //    int r;
-        //    if (sharedName == null)
-        //    {
-        //        r = conn.Execute(Sql_Select_SharedName_Where_Key_Equals_And_SharedName_IsNull, GetId(key));
-        //    }
-        //    else
-        //    {
-        //        r = conn.Execute(Sql_Select_SharedName_Where_Key_Equals_And_SharedName_Equals, GetId(key, sharedName), sharedName);
-        //    }
-        //    return r > 0;
-        //}
-
         public bool PlatformContainsKey(string key, string? sharedName)
         {
             var id = GetId(key, sharedName);
-            var item = conn.Table<Entity>().Where(x => x.Id == id && x.SharedName == sharedName).FirstOrDefault();
+            sharedName ??= string.Empty;
+            var item = conn.Table<Entity>()
+                .Where(x => x.Id == id && x.SharedName == sharedName)
+                .FirstOrDefault();
             return item != null;
         }
 
-        //public T? PlatformGet<T>(string key, T? defaultValue, string? sharedName) where T : notnull, IConvertible
-        //{
-        //    string? r;
-        //    if (sharedName == null)
-        //    {
-        //        r = conn.ExecuteScalar<string?>(Sql_Select_Value_Where_Key_Equals_And_SharedName_IsNull, GetId(key));
-        //    }
-        //    else
-        //    {
-        //        r = conn.ExecuteScalar<string?>(Sql_Select_Value_Where_Key_Equals_And_SharedName_Equals, GetId(key, sharedName), sharedName);
-        //    }
-        //    if (r == null) return defaultValue;
-        //    var r2 = ConvertibleHelper.Convert<T>(r);
-        //    return r2;
-        //}
-
         public T? PlatformGet<T>(string key, T? defaultValue, string? sharedName) where T : notnull, IConvertible
         {
             var id = GetId(key, sharedName);
-            var item = conn.Table<Entity>().Where(x => x.Id == id && x.SharedName == sharedName).FirstOrDefault();
+            sharedName ??= string.Empty;
+            var item = conn.Table<Entity>()
+                .Where(x => x.Id == id && x.SharedName == sharedName)
+                .FirstOrDefault();
             if (item == null) return defaultValue;
             var value = ConvertibleHelper.Convert<T>(item.Value);
             return value;
         }
 
-        //public void PlatformRemove(string key, string? sharedName)
-        //{
-        //    if (sharedName == null)
-        //    {
-        //        conn.Execute(Sql_Delete_Where_Id_Equals_And_SharedName_IsNull, GetId(key));
-        //    }
-        //    else
-        //    {
-        //        conn.Execute(Sql_Delete_Where_Id_Equals_And_SharedName_Equals, GetId(key, sharedName), sharedName);
-        //    }
-        //}
-
         public void PlatformRemove(string key, string? sharedName)
         {
             var id = GetId(key, sharedName);
@@ -132,19 +70,16 @@ public void PlatformSet<T>(string key, T? value, string? sharedName) where T : n
                 {
                     Id = id,
                     Value = value.ToString(CultureInfo.InvariantCulture),
-                    SharedName = sharedName,
+                    SharedName = sharedName ?? string.Empty,
                 });
             }
         }
 
-        const string TableName = "0984415E";
+        const string TableName = "1984415E";
         const string ColumnName_Id = "0F5E4BAA";
         const string ColumnName_Value = "4FC331D7";
         const string ColumnName_SharedName = "F6A739AA";
 
-        const string Sql_Delete_All =
-            $"DELETE FROM \"{TableName}\"";
-
         const string Sql_Delete_Where_SharedName_Equals =
             $"DELETE FROM \"{TableName}\" WHERE \"{ColumnName_SharedName}\" = ?";
 
@@ -174,19 +109,18 @@ public sealed class Entity : IEntity<string>
             [Column(ColumnName_Id)]
             [PrimaryKey]
             [SQLiteNotNull]
-            [NotNull, DisallowNull] // C# 8 not null
-            public string? Id { get; set; }
+            public string Id { get; set; } = string.Empty;
 
             [Column(ColumnName_Value)]
             [SQLiteNotNull]
-            [NotNull, DisallowNull] // C# 8 not null
-            public string? Value { get; set; }
+            public string Value { get; set; } = string.Empty;
 #pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
 
             [Column(ColumnName_SharedName)]
-            public string? SharedName { get; set; }
+            [SQLiteNotNull]
+            public string SharedName { get; set; } = string.Empty;
 
-            string DebuggerDisplay() => SharedName == null ? $"{Id}, {Value}" : $"{Id}, {Value}, {SharedName}";
+            string DebuggerDisplay() => SharedName == string.Empty ? $"{Id}, {Value}" : $"{Id}, {Value}, {SharedName}";
         }
     }
 }
diff --git a/src/ST.Client.Android/Services/Implementation/AndroidDeviceInfoPlatformServiceImpl.cs b/src/ST.Client.Android/Services/Implementation/AndroidDeviceInfoPlatformServiceImpl.cs
@@ -114,23 +114,28 @@ static bool _()
                         newRating++;
                     }
 
-                    try
-                    {
-                        var opengl = Android.Opengl.GLES20.GlGetString(Android.Opengl.GLES20.GlRenderer);
-                        if (!string.IsNullOrWhiteSpace(opengl))
-                        {
-#pragma warning disable CS8604 // 可能的 null 引用参数。
-                            if (contains(opengl, "Bluestacks") ||
-                                contains(opengl, "Translator") ||
-                                contains(opengl, "youwave")
-                            )
-#pragma warning restore CS8604 // 可能的 null 引用参数。
-                                newRating += 10;
-                        }
-                    }
-                    catch
-                    {
-                    }
+                    /* signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xdd0
+                     * Cause: null pointer dereference
+                     * backtrace:
+                     * #00 pc 0000000000005ff4  /system/lib64/libGLESv1_CM.so (glGetString+52)
+                     */
+//                    try
+//                    {
+//                        var opengl = Android.Opengl.GLES20.GlGetString(Android.Opengl.GLES20.GlRenderer);
+//                        if (!string.IsNullOrWhiteSpace(opengl))
+//                        {
+//#pragma warning disable CS8604 // 可能的 null 引用参数。
+//                            if (contains(opengl, "Bluestacks") ||
+//                                contains(opengl, "Translator") ||
+//                                contains(opengl, "youwave")
+//                            )
+//#pragma warning restore CS8604 // 可能的 null 引用参数。
+//                                newRating += 10;
+//                        }
+//                    }
+//                    catch
+//                    {
+//                    }
 
                     try
                     {
diff --git a/src/ST.Client/UI/ViewModels/MainWindowViewModel.TabItems.cs b/src/ST.Client/UI/ViewModels/MainWindowViewModel.TabItems.cs
@@ -9,7 +9,24 @@ partial class MainWindowViewModel
         readonly Dictionary<Type, Lazy<TabItemViewModel>> mTabItems = new();
         public IEnumerable<TabItemViewModel> TabItems => mTabItems.Values.Select(x => x.Value);
 
-        public IReadOnlyList<TabItemViewModel>? FooterTabItems { get; private set; }
+        IReadOnlyList<TabItemViewModel>? _FooterTabItems;
+        public IReadOnlyList<TabItemViewModel>? FooterTabItems
+        {
+            get
+            {
+                if (_FooterTabItems == null)
+                {
+                    var settingsPageVM = SettingsPageViewModel.Instance;
+                    var aboutPageVM = AboutPageViewModel.Instance;
+                    _FooterTabItems = new List<TabItemViewModel>
+                    {
+                        settingsPageVM,
+                        aboutPageVM,
+                    };
+                }
+                return _FooterTabItems;
+            }
+        }
 
         public IEnumerable<TabItemViewModel> AllTabItems
         {
@@ -20,6 +37,18 @@ public IEnumerable<TabItemViewModel> AllTabItems
             }
         }
 
+        /// <summary>
+        /// 当前 <see cref="AllTabItems"/>，延时加载 <see cref="FooterTabItems"/>
+        /// </summary>
+        public IEnumerable<TabItemViewModel> CurrentAllTabItems
+        {
+            get
+            {
+                if (_FooterTabItems == null) return TabItems;
+                else return TabItems.Concat(_FooterTabItems);
+            }
+        }
+
         void AddTabItem<TabItemVM>() where TabItemVM : TabItemViewModel, new()
         {
             Lazy<TabItemViewModel> value = new(() => new TabItemVM()
diff --git a/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs b/src/ST.Client/UI/ViewModels/MainWindowViewModel.cs
@@ -88,20 +88,14 @@ public MainWindowViewModel()
                 });
             }
 
-            FooterTabItems = new List<TabItemViewModel>
-            {
-                SettingsPageViewModel.Instance,
-                AboutPageViewModel.Instance,
-            };
-
             #region InitTabItems
 
 
             //AddTabItem<StartPageViewModel>();
             AddTabItem<CommunityProxyPageViewModel>();
-            AddTabItem<ProxyScriptManagePageViewModel>();
             if (IApplication.IsDesktopPlatform)
             {
+                AddTabItem<ProxyScriptManagePageViewModel>();
                 AddTabItem<SteamAccountPageViewModel>();
                 AddTabItem<GameListPageViewModel>();
             }
@@ -134,7 +128,7 @@ public MainWindowViewModel()
 
             R.Subscribe(() =>
             {
-                foreach (var item in AllTabItems)
+                foreach (var item in CurrentAllTabItems)
                 {
                     item.RaisePropertyChanged(nameof(TabItemViewModelBase.Name));
                 }
diff --git a/src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs
@@ -19,7 +19,7 @@ namespace System.Application.UI.ViewModels
 {
     public partial class CommunityProxyPageViewModel
     {
-        readonly IHostsFileService hostsFileService = IHostsFileService.Instance;
+        readonly IHostsFileService? hostsFileService;
         readonly IPlatformService platformService = IPlatformService.Instance;
 
         public ReactiveCommand<Unit, Unit>? SetupCertificateCommand { get; }
@@ -58,6 +58,7 @@ public CommunityProxyPageViewModel()
 
             if (IApplication.IsDesktopPlatform)
             {
+                hostsFileService = IHostsFileService.Instance;
                 SetupCertificateCommand = ReactiveCommand.Create(SetupCertificate_OnClick);
                 DeleteCertificateCommand = ReactiveCommand.Create(DeleteCertificate_OnClick);
                 EditHostsFileCommand = ReactiveCommand.Create(hostsFileService.OpenFile);
diff --git a/src/ST.Client/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs
@@ -28,12 +28,12 @@ public SettingsPageViewModel()
 
             UpdateChannels = Enum2.GetAll<UpdateChannelType>();
 
-            SelectFont = R.Fonts.FirstOrDefault(x => x.Value == UISettings.FontName.Value);
-            this.WhenValueChanged(x => x.SelectFont, false)
-                  .Subscribe(x => UISettings.FontName.Value = x.Value);
-
             if (IApplication.IsDesktopPlatform)
             {
+                SelectFont = R.Fonts.FirstOrDefault(x => x.Value == UISettings.FontName.Value);
+                this.WhenValueChanged(x => x.SelectFont, false)
+                      .Subscribe(x => UISettings.FontName.Value = x.Value);
+
                 SelectImage_Click = ReactiveCommand.CreateFromTask(async () =>
                 {
                     FilePickerFileType fileTypes = new ValueTuple<string, string[]>[] {

Original file line number	Diff line number	Diff line change
`@@ -88,20 +88,14 @@ public MainWindowViewModel()`
`88`	`88`	`});`
`89`	`89`	`}`
`90`	`90`
`91`		`- FooterTabItems = new List<TabItemViewModel>`
`92`		`- {`
`93`		`- SettingsPageViewModel.Instance,`
`94`		`- AboutPageViewModel.Instance,`
`95`		`- };`
`96`		`-`
`97`	`91`	`#region InitTabItems`
`98`	`92`
`99`	`93`
`100`	`94`	`//AddTabItem<StartPageViewModel>();`
`101`	`95`	`AddTabItem<CommunityProxyPageViewModel>();`
`102`		`- AddTabItem<ProxyScriptManagePageViewModel>();`
`103`	`96`	`if (IApplication.IsDesktopPlatform)`
`104`	`97`	`{`
	`98`	`+ AddTabItem<ProxyScriptManagePageViewModel>();`
`105`	`99`	`AddTabItem<SteamAccountPageViewModel>();`
`106`	`100`	`AddTabItem<GameListPageViewModel>();`
`107`	`101`	`}`
`@@ -134,7 +128,7 @@ public MainWindowViewModel()`
`134`	`128`
`135`	`129`	`R.Subscribe(() =>`
`136`	`130`	`{`
`137`		`- foreach (var item in AllTabItems)`
	`131`	`+ foreach (var item in CurrentAllTabItems)`
`138`	`132`	`{`
`139`	`133`	`item.RaisePropertyChanged(nameof(TabItemViewModelBase.Name));`
`140`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace System.Application.UI.ViewModels`
`19`	`19`	`{`
`20`	`20`	`public partial class CommunityProxyPageViewModel`
`21`	`21`	`{`
`22`		`- readonly IHostsFileService hostsFileService = IHostsFileService.Instance;`
	`22`	`+ readonly IHostsFileService? hostsFileService;`
`23`	`23`	`readonly IPlatformService platformService = IPlatformService.Instance;`
`24`	`24`
`25`	`25`	`public ReactiveCommand<Unit, Unit>? SetupCertificateCommand { get; }`
`@@ -58,6 +58,7 @@ public CommunityProxyPageViewModel()`
`58`	`58`
`59`	`59`	`if (IApplication.IsDesktopPlatform)`
`60`	`60`	`{`
	`61`	`+ hostsFileService = IHostsFileService.Instance;`
`61`	`62`	`SetupCertificateCommand = ReactiveCommand.Create(SetupCertificate_OnClick);`
`62`	`63`	`DeleteCertificateCommand = ReactiveCommand.Create(DeleteCertificate_OnClick);`
`63`	`64`	`EditHostsFileCommand = ReactiveCommand.Create(hostsFileService.OpenFile);`