🐛 修复某些情况导入SDA令牌出错

BeyondDimension · Jan 4, 2024 · 9805ad4 · 9805ad4
1 parent 83ae310
commit 9805ad4
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 17 deletions.
diff --git a/src/BD.WTTS.Client.Avalonia/Extensions/ControlExtensions.cs b/src/BD.WTTS.Client.Avalonia/Extensions/ControlExtensions.cs
@@ -2,18 +2,11 @@ namespace BD.WTTS.UI;
 
 public static class ControlExtensions
 {
-    public static void SetViewModel<T>(this Control c, bool useCache = true) where T : ViewModelBase
+    public static void SetViewModel<T>(this Control c) where T : ViewModelBase, new()
     {
         if (c.DataContext == null || c.DataContext.GetType() != typeof(T))
         {
-            T cx;
-
-            if (useCache)
-                cx = IViewModelManager.Instance.Get<T>();
-            else
-                cx = Activator.CreateInstance<T>();
-
-            c.DataContext = cx;
+            c.DataContext = new T();
         }
     }
 }
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml.cs b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml.cs
@@ -8,7 +8,8 @@ public partial class AboutPage : ReactiveUserControl<AboutPageViewModel>
     public AboutPage()
     {
         InitializeComponent();
-        this.SetViewModel<AboutPageViewModel>(false);
+        DataContext = new AboutPageViewModel();
+        this.SetViewModel<AboutPageViewModel>();
     }
 
     /// <summary>

diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml.cs b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml.cs
@@ -7,7 +7,7 @@ public partial class DebugPage : PageBase<DebugPageViewModel>
     public DebugPage()
     {
         InitializeComponent();
-        this.SetViewModel<DebugPageViewModel>(false);
+        this.SetViewModel<DebugPageViewModel>();
 
         CommandTextBox.KeyUp += (s, e) =>
         {

diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml.cs b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml.cs
@@ -7,7 +7,7 @@ public partial class HomePage : ReactiveUserControl<HomePageViewModel>
     public HomePage()
     {
         InitializeComponent();
-        this.SetViewModel<HomePageViewModel>(true);
+        this.SetViewModel<HomePageViewModel>();
 
         //ShopsScrollViewer.PointerWheelChanged += ShopsScrollViewer_PointerWheelChanged;
     }

diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/SettingsPage.axaml.cs b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/SettingsPage.axaml.cs
@@ -7,7 +7,7 @@ public partial class SettingsPage : PageBase<SettingsPageViewModel>
     public SettingsPage()
     {
         InitializeComponent();
-        this.SetViewModel<SettingsPageViewModel>(false);
+        this.SetViewModel<SettingsPageViewModel>();
 
         //SettingsScrollTab.SelectionChanged += SettingsScrollTab_SelectionChanged;
 

diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/User/LoginOrRegisterPage.axaml.cs b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/User/LoginOrRegisterPage.axaml.cs
@@ -34,7 +34,7 @@ public LoginOrRegisterPage()
     protected override void OnLoaded(RoutedEventArgs e)
     {
         base.OnLoaded(e);
-        this.SetViewModel<LoginOrRegisterWindowViewModel>(false);
+        this.SetViewModel<LoginOrRegisterWindowViewModel>();
 
         if (this.ViewModel != null)
         {

diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/AcceleratorPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/AcceleratorPage.axaml.cs
@@ -7,6 +7,6 @@ public partial class AcceleratorPage : PageBase<AcceleratorPageViewModel>
     public AcceleratorPage()
     {
         InitializeComponent();
-        this.SetViewModel<AcceleratorPageViewModel>(false);
+        this.SetViewModel<AcceleratorPageViewModel>();
     }
 }
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml.cs
@@ -7,7 +7,7 @@ public partial class ScriptPage : PageBase<ScriptPageViewModel>
     public ScriptPage()
     {
         InitializeComponent();
-        this.SetViewModel<ScriptPageViewModel>(false);
+        this.SetViewModel<ScriptPageViewModel>();
 
         //StoreButton.Click += StoreButton_Click;
     }

diff --git a/...BD.WTTS.Client.Plugins.Authenticator/Models/AuthenticatorImportFileModels/SDAFileModel.cs b/...BD.WTTS.Client.Plugins.Authenticator/Models/AuthenticatorImportFileModels/SDAFileModel.cs
@@ -32,6 +32,7 @@ public class SdaFileModel
     [JsonPropertyName("secret_1")]
     public string Secret1 { get; set; } = string.Empty;
 
+    [JsonConverter(typeof(SteamDataIntConverter))]
     [JsonPropertyName("status")]
     public int Status { get; set; }
 
@@ -110,6 +111,7 @@ public class Session
     [JsonPropertyName("OAuthToken")]
     public string OAuthToken { get; set; } = string.Empty;
 
+    [JsonConverter(typeof(SteamDataLongConverter))]
     [JsonPropertyName("SteamID")]
     public long SteamId { get; set; }
 }

diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml.cs
@@ -11,7 +11,7 @@ public partial class GameAccountPage : PageBase<GameAccountPageViewModel>
     public GameAccountPage()
     {
         InitializeComponent();
-        this.SetViewModel<GameAccountPageViewModel>(true);
+        this.SetViewModel<GameAccountPageViewModel>();
         //DataContext ??= new GameAccountPageViewModel();
 
         //this.WhenActivated(disposable =>