Bug Fix

XTsat · Jun 9, 2022 · bbcf171 · bbcf171
1 parent 6a8cd68
commit bbcf171
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 23 deletions.
diff --git a/references/SteamAchievementManager b/references/SteamAchievementManager
diff --git a/...lient.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/CloudArchiveWindow.axaml b/...lient.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/CloudArchiveWindow.axaml
@@ -76,6 +76,18 @@
       </DockPanel>
     </StackPanel>
 
+    <StackPanel Spacing="15"
+                Margin="0 60 0 0"
+                VerticalAlignment="Center"
+                HorizontalAlignment="Center"
+                IsVisible="{Binding IsLoading}">
+      <ProgressBar Classes="Circle"
+                   Width="50"
+                   Height="50"
+                   IsIndeterminate="True"/>
+      <TextBlock Text="{ReflectionBinding Path=Res.GameList_IsLoading,Mode=OneWay,Source={x:Static resx:R.Current}}"></TextBlock>
+    </StackPanel>
+
     <TabControl Classes="flat"
                 Margin="0 20 0 0"
                 ZIndex="1">

diff --git a/src/ST.Client/UI/Resx/AppResources.Designer.cs b/src/ST.Client/UI/Resx/AppResources.Designer.cs
diff --git a/src/ST.Client/UI/Resx/AppResources.resx b/src/ST.Client/UI/Resx/AppResources.resx
@@ -580,7 +580,7 @@ AAAAA-BBBBB-CCCC3</value>
     <value>没有获取到任何游戏数据</value>
   </data>
   <data name="GameList_IsLoading" xml:space="preserve">
-    <value>正在加载游戏列表...</value>
+    <value>正在加载...</value>
   </data>
   <data name="GameList_ListCount" xml:space="preserve">
     <value>已添加 ({0}/{1})</value>
@@ -2282,6 +2282,9 @@ AAAAA-BBBBB-CCCC3</value>
   <data name="GameList_CloudArchiveDeleteTip" xml:space="preserve">
     <value>确定要删除当前选中的存档数据吗？</value>
   </data>
+  <data name="GameList_CloudArchiveDeleteAllTip" xml:space="preserve">
+    <value>确定要删除全部存档数据吗，请一定要明白你在做什么，该操作会清除当前游戏的全部云存档数据！！！</value>
+  </data>
   <data name="GameList_UploadCloudArchiveFile" xml:space="preserve">
     <value>手动上传存档文件</value>
   </data>

diff --git a/src/ST.Client/UI/ViewModels/Pages/GameListPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/GameListPageViewModel.cs
@@ -428,12 +428,10 @@ public static async void ManageCloudArchive_Click(SteamApp app)
                 Toast.Show(AppResources.GameList_SteamNotRuning);
                 return;
             }
-            if (app.IsCloudArchive)
-            {
-                Toast.Show(AppResources.GameList_RuningWait);
-                app.StartSteamAppProcess(SteamAppRunType.CloudManager);
-                SteamConnectService.Current.RuningSteamApps.TryAdd(app.AppId, app);
-            }
+
+            Toast.Show(AppResources.GameList_RuningWait);
+            app.StartSteamAppProcess(SteamAppRunType.CloudManager);
+            SteamConnectService.Current.RuningSteamApps.TryAdd(app.AppId, app);
         }
 
         public static void AppGridReSize()

diff --git a/src/ST.Client/UI/ViewModels/Windows/GameListPage/CloudArchiveWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/GameListPage/CloudArchiveWindowViewModel.cs
@@ -30,6 +30,14 @@ public class CloudArchiveWindowViewModel : WindowViewModel
         public ReadOnlyObservableCollection<SteamRemoteFile>? CloudArchivews => _CloudArchivews;
 
         public string CloudArchivewCountStr => string.Format(AppResources.FileNumber, CloudArchivews?.Count ?? 0);
+
+        private bool _IsLoading;
+
+        public bool IsLoading
+        {
+            get => _IsLoading;
+            set => this.RaiseAndSetIfChanged(ref _IsLoading, value);
+        }
         #endregion
 
         //private bool? _IsCheckAll;
@@ -40,15 +48,15 @@ public class CloudArchiveWindowViewModel : WindowViewModel
         //    set => this.RaiseAndSetIfChanged(ref _IsCheckAll, value);
         //}
 
-        public bool IsCloudEnabledForAccount { get; }
+        //public bool IsCloudEnabledForAccount { get; }
 
-        private bool _IsCloudEnabledForApp;
+        //private bool _IsCloudEnabledForApp;
 
-        public bool IsCloudEnabledForApp
-        {
-            get => _IsCloudEnabledForApp;
-            set => this.RaiseAndSetIfChanged(ref _IsCloudEnabledForApp, value);
-        }
+        //public bool IsCloudEnabledForApp
+        //{
+        //    get => _IsCloudEnabledForApp;
+        //    set => this.RaiseAndSetIfChanged(ref _IsCloudEnabledForApp, value);
+        //}
 
         private int _UsedQutoa;
 
@@ -100,21 +108,30 @@ public CloudArchiveWindowViewModel(int appid)
 
         public void RefreshList()
         {
-            var results = ISteamworksLocalApiService.Instance.GetCloudArchiveFiles();
-            _CloudArchivewSourceList.Clear();
-            if (results.Any_Nullable())
-                _CloudArchivewSourceList.AddRange(results);
-
+            if (!IsLoading)
+            {
+                IsLoading = true;
+                var results = ISteamworksLocalApiService.Instance.GetCloudArchiveFiles();
+                _CloudArchivewSourceList.Clear();
+                if (results.Any_Nullable())
+                    _CloudArchivewSourceList.AddRange(results);
+                IsLoading = false;
+            }
+            _CloudArchivewSourceList.Items.Sum(x => x.Size);
             ISteamworksLocalApiService.Instance.GetCloudArchiveQuota(out var totalBytes, out var availBytes);
             TotalQutoa = (int)(totalBytes / 1024 / 1024);
-            UsedQutoa = (int)((totalBytes - availBytes) / 1024 / 1024);
+            UsedQutoa = (int)(_CloudArchivewSourceList.Items.Sum(x => x.Size) / 1024 / 1024);
         }
 
         public async void ClearAllFiles()
         {
-            var result = await MessageBox.ShowAsync(AppResources.Achievement_ResetWaring_1, Title, MessageBox.Button.OKCancel);
+            var result = await MessageBox.ShowAsync(AppResources.GameList_CloudArchiveDeleteAllTip, Title, MessageBox.Button.OKCancel);
             if (result.IsOK())
             {
+                foreach (var file in _CloudArchivewSourceList.Items)
+                {
+                    DeleteFile(file);
+                }
                 RefreshList();
             }
         }