🐛 修复战网账号切换对旧版本数据支持问题

BeyondDimension · Nov 30, 2024 · 35641d5 · 35641d5
1 parent 07f1a9f
commit 35641d5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml
@@ -91,6 +91,12 @@
                             CommandParameter="{Binding Data.AssemblyLocation}"
                             Content="{Binding Path=Res.Plugin_OpenFolder, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                             IsClickEnabled="True" />
+                        <ui:SettingsExpanderItem
+                            ActionIconSource="Open"
+                            Command="{Binding $parent[spp:Settings_Plugin].((spp:SettingsPageViewModel)DataContext).OpenPluginCacheDirectory_Click}"
+                            CommandParameter="{Binding Data.AppDataDirectory}"
+                            Content="{Binding Path=Res.Plugin_OpenAppDataFolder, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
+                            IsClickEnabled="True" />
                         <ui:SettingsExpanderItem
                             ActionIconSource="Open"
                             Command="{Binding $parent[spp:Settings_Plugin].((spp:SettingsPageViewModel)DataContext).OpenPluginCacheDirectory_Click}"

diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/Services.Implementation/BasicPlatformSwitcher.cs b/src/BD.WTTS.Client.Plugins.GameAccount/Services.Implementation/BasicPlatformSwitcher.cs
@@ -82,7 +82,8 @@ async ValueTask<bool> BasicCopyInAccount(string accId, PlatformAccount platform)
                 var selector = accFile.Split("::")[2];
                 if (!JTokenHelper.ReplaceVarInJsonFile(path, selector, jToken))
                 {
-                    Toast.Show(ToastIcon.Error, AppResources.Error_ModifyJsonFileFailed);
+                    //Toast.Show(ToastIcon.Error, AppResources.Error_ModifyJsonFileFailed);
+                    Log.Error(nameof(BasicPlatformSwitcher), $"Failed to modify JSON file: {path}");
                     //return false;
                 }
                 continue;
@@ -179,7 +180,7 @@ async ValueTask<bool> ClearCurrentLoginUserCore(PlatformAccount platform)
         {
             var path = uniqueIdFile.Split("::")[0];
             var selector = uniqueIdFile.Split("::")[1];
-            JTokenHelper.ReplaceVarInJsonFile(path, selector, "");
+            JTokenHelper.ReplaceVarInJsonFile(path, selector, string.Empty);
         }
 
         if (platform.UniqueIdType != UniqueIdType.CREATE_ID_FILE) return true;

diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json
@@ -148,7 +148,10 @@
     "PlatformIds": [ "b", "bnet", "battlenet", "blizzard" ],
     "DefaultExePath": "%ProgramFiles(x86)%\\Battle.net\\Battle.net.exe",
     "ExesToEnd": [ "Battle.net" ],
-    "ClearPaths": [ "SAME_AS_LOGIN_FILES" ],
+    "ClearPaths": [
+      "JSON_SELECT_FIRST,::%AppData%\\Battle.net\\Battle.net.config::$.Client.SavedAccountNames",
+      "%AppData%\\Battle.net\\WattToolkit.id"
+    ],
     "LoginFiles": {
       "JSON_SELECT_FIRST,::%AppData%\\Battle.net\\Battle.net.config::$.Client.SavedAccountNames": "email.json",
       "JSON_SELECT_FIRST,::%AppData%\\Battle.net\\Battle.net.config::$..Services.LastLoginRegion": "LastLoginRegion",

diff --git a/src/BD.WTTS.Client/Resources/Strings.Designer.cs b/src/BD.WTTS.Client/Resources/Strings.Designer.cs
diff --git a/src/BD.WTTS.Client/Resources/Strings.resx b/src/BD.WTTS.Client/Resources/Strings.resx
@@ -2267,6 +2267,9 @@
   </data>
 	<data name="Plugin_OpenCacheFolder" xml:space="preserve">
     <value>打开插件缓存文件夹</value>
+  </data>
+	<data name="Plugin_OpenAppDataFolder" xml:space="preserve">
+    <value>打开插件 AppData 文件夹</value>
   </data>
 	<data name="Plugin_OpenFolder" xml:space="preserve">
     <value>打开插件文件夹</value>