Misc

rmbadmin · rmbadmin · commit 66832affdd87 · 2022-06-13T02:28:35.000+08:00
diff --git a/src/ST.Client.CommandLine/CommandLineHost.cs b/src/ST.Client.CommandLine/CommandLineHost.cs
@@ -175,14 +175,15 @@ void MainHandlerByCLT_(Action? onInitStartuped)
 
                 var currentuser = users.Where(s => s.AccountName == account).FirstOrDefault();
 
+                await steamService.ShutdownSteam();
+
                 if (currentuser != null)
                 {
                     currentuser.MostRecent = true;
                     steamService.UpdateLocalUserData(users);
                     steamService.SetCurrentUser(account);
                 }
 
-                await steamService.ShutdownSteam();
                 steamService.StartSteam();
             }
         });
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml
@@ -22,7 +22,7 @@
         x:CompileBindings="True">
   <Panel>
     <controls:TitleBar/>
-    <Panel x:Name="TitleBarHost" 
+    <Panel x:Name="TitleBarHost"
            VerticalAlignment="Top"
            Background="Transparent"
            Height="{StaticResource TitleBarHeight}"/>
@@ -180,6 +180,7 @@
                               HorizontalAlignment="Stretch"
                               MaxWidth="200"
                               Command="{ReflectionBinding #u.DataContext.SetFirstButton_Click}"
+                              IsEnabled="{Binding !Disable}"
                               CommandParameter="{Binding}">
                         <controls:ScrollingTextBlock Text="{ReflectionBinding Path=Res.Top,Mode=OneWay,Source={x:Static resx:R.Current}}"></controls:ScrollingTextBlock>
                       </Button>
@@ -189,6 +190,7 @@
                               HorizontalAlignment="Stretch"
                               MaxWidth="200"
                               Command="{ReflectionBinding #u.DataContext.UpButton_Click}"
+                              IsEnabled="{Binding !Disable}"
                               CommandParameter="{Binding}">
                         <controls:ScrollingTextBlock Text="{ReflectionBinding Path=Res.Up,Mode=OneWay,Source={x:Static resx:R.Current}}"></controls:ScrollingTextBlock>
                       </Button>
@@ -198,6 +200,7 @@
                               MaxWidth="200"
                               HorizontalAlignment="Stretch"
                               Command="{ReflectionBinding #u.DataContext.DownButton_Click}"
+                              IsEnabled="{Binding !Disable}"
                               CommandParameter="{Binding}">
                         <controls:ScrollingTextBlock Text="{ReflectionBinding Path=Res.Dow,Mode=OneWay,Source={x:Static resx:R.Current}}"></controls:ScrollingTextBlock>
                       </Button>
diff --git a/src/ST.Client/Services/ISteamService.cs b/src/ST.Client/Services/ISteamService.cs
@@ -55,7 +55,7 @@ public interface ISteamService
         void StartSteam(string? arguments = null);
 
         /// <summary>
-        /// 退出 Steam
+        /// 安全退出 Steam（如果有修改Steam数据的操作请退出后在执行不然Steam安全退出会还原修改）
         /// </summary>
         Task ShutdownSteam();
 
diff --git a/src/ST.Client/UI/ViewModels/Pages/SteamAccountPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
@@ -131,6 +131,8 @@ private async void ReStartSteamByUser(SteamUser? user = null)
             foreach (var item in SteamUsers.Where(x => x.MostRecent))
                 item.MostRecent = false;
 
+            await steamService.ShutdownSteam();
+
             if (user != null)
             {
                 user.MostRecent = true;
@@ -142,7 +144,6 @@ private async void ReStartSteamByUser(SteamUser? user = null)
                 steamService.SetCurrentUser(string.Empty);
             }
 
-            await steamService.ShutdownSteam();
             steamService.StartSteam(SteamSettings.SteamStratParameter.Value);
         }
 
diff --git a/src/ST.Client/UI/ViewModels/Windows/SteamAccountPage/ShareManageViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/SteamAccountPage/ShareManageViewModel.cs
@@ -61,9 +61,8 @@ public void Refresh_Click()
                 Timeused = x.Timeused,
                 Description = x.Description,
                 Disable = true,
-                Tokenid = x.Tokenid
+                Tokenid = x.Tokenid,
             }));
-            int count = allList.Count - 1;
             foreach (var item in allList)
             {
                 var temp = userlist.FirstOrDefault(x => x.SteamId32 == item.SteamId3_Int);
@@ -198,7 +197,7 @@ public async void SetActivity_Click()
             var result = await MessageBox.ShowAsync(AppResources.AccountChange_RestartSteam, button: MessageBox.Button.OKCancel);
             if (result.IsOK())
             {
-                await steamService.ShutdownSteam();
+                steamService.TryKillSteamProcess();
                 steamService.StartSteam();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -175,14 +175,15 @@ void MainHandlerByCLT_(Action? onInitStartuped)`
`175`	`175`
`176`	`176`	`var currentuser = users.Where(s => s.AccountName == account).FirstOrDefault();`
`177`	`177`
	`178`	`+ await steamService.ShutdownSteam();`
	`179`	`+`
`178`	`180`	`if (currentuser != null)`
`179`	`181`	`{`
`180`	`182`	`currentuser.MostRecent = true;`
`181`	`183`	`steamService.UpdateLocalUserData(users);`
`182`	`184`	`steamService.SetCurrentUser(account);`
`183`	`185`	`}`
`184`	`186`
`185`		`- await steamService.ShutdownSteam();`
`186`	`187`	`steamService.StartSteam();`
`187`	`188`	`}`
`188`	`189`	`});`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,8 @@ private async void ReStartSteamByUser(SteamUser? user = null)`
`131`	`131`	`foreach (var item in SteamUsers.Where(x => x.MostRecent))`
`132`	`132`	`item.MostRecent = false;`
`133`	`133`
	`134`	`+ await steamService.ShutdownSteam();`
	`135`	`+`
`134`	`136`	`if (user != null)`
`135`	`137`	`{`
`136`	`138`	`user.MostRecent = true;`
`@@ -142,7 +144,6 @@ private async void ReStartSteamByUser(SteamUser? user = null)`
`142`	`144`	`steamService.SetCurrentUser(string.Empty);`
`143`	`145`	`}`
`144`	`146`
`145`		`- await steamService.ShutdownSteam();`
`146`	`147`	`steamService.StartSteam(SteamSettings.SteamStratParameter.Value);`
`147`	`148`	`}`
`148`	`149`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,8 @@ public void Refresh_Click()`
`61`	`61`	`Timeused = x.Timeused,`
`62`	`62`	`Description = x.Description,`
`63`	`63`	`Disable = true,`
`64`		`- Tokenid = x.Tokenid`
	`64`	`+ Tokenid = x.Tokenid,`
`65`	`65`	`}));`
`66`		`- int count = allList.Count - 1;`
`67`	`66`	`foreach (var item in allList)`
`68`	`67`	`{`
`69`	`68`	`var temp = userlist.FirstOrDefault(x => x.SteamId32 == item.SteamId3_Int);`
`@@ -198,7 +197,7 @@ public async void SetActivity_Click()`
`198`	`197`	`var result = await MessageBox.ShowAsync(AppResources.AccountChange_RestartSteam, button: MessageBox.Button.OKCancel);`
`199`	`198`	`if (result.IsOK())`
`200`	`199`	`{`
`201`		`- await steamService.ShutdownSteam();`
	`200`	`+ steamService.TryKillSteamProcess();`
`202`	`201`	`steamService.StartSteam();`
`203`	`202`	`}`
`204`	`203`	`}`