Merge pull request #33 from tsxlts/2.0.6.3

tsxlts · web-flow · commit 4e353367a90e · 2025-04-24T16:05:25.000+08:00
修复已知问题
diff --git a/SteamAuthenticator/Events/UserPanelEvents.cs b/SteamAuthenticator/Events/UserPanelEvents.cs
@@ -19,10 +19,10 @@ private void UsersPanel_SizeChanged(object sender, EventArgs e)
 
         private async void addUserBtn_Click(object sender, EventArgs e)
         {
-            await Login(false, null);
+            await Login(null);
         }
 
-        private async void btnUser_Click(object sender, MouseEventArgs e)
+        private void btnUser_Click(object sender, MouseEventArgs e)
         {
             if (e.Button != MouseButtons.Left)
             {
@@ -33,7 +33,7 @@ private async void btnUser_Click(object sender, MouseEventArgs e)
             SteamUserPanel panel = control.Parent as SteamUserPanel;
             UserClient userClient = panel.Client;
 
-            await SwitchUser(userClient);
+            SetCurrentClient(userClient);
         }
 
         private void copyCookieMenuItem_Click(object sender, EventArgs e)
@@ -89,15 +89,15 @@ private void copyRefreshTokenMenuItem_Click(object sender, EventArgs e)
             Utils.CopyText(refreshToken);
         }
 
-        private async void setCurrentClientMenuItem_Click(object sender, EventArgs e)
+        private void setCurrentClientMenuItem_Click(object sender, EventArgs e)
         {
             ToolStripMenuItem menuItem = sender as ToolStripMenuItem;
             ContextMenuStrip menuStrip = (ContextMenuStrip)menuItem.GetCurrentParent();
 
             SteamUserPanel panel = menuStrip.SourceControl.Parent as SteamUserPanel;
             UserClient userClient = panel.Client;
 
-            await SwitchUser(userClient);
+            SetCurrentClient(userClient);
         }
 
         private void settingMenuItem_Click(object sender, EventArgs e)
@@ -157,7 +157,7 @@ private async void reloginMenuItem_Click(object sender, EventArgs e)
                 return;
             }
 
-            await Login(false, userClient.GetAccount());
+            await Login(userClient.GetAccount());
         }
 
         private async void logoutMenuItem_Click(object sender, EventArgs e)
@@ -190,7 +190,7 @@ private void removeUserMenuItem_Click(object sender, EventArgs e)
 
             if (userClient.User.SteamId == currentClient?.User?.SteamId)
             {
-                SetCurrentClient(Appsetting.Instance.Clients.FirstOrDefault() ?? userClient, true);
+                SetCurrentClient(Appsetting.Instance.Clients.FirstOrDefault());
             }
         }
 
@@ -279,121 +279,84 @@ private async Task LoadUsers()
             }
         }
 
-        private async Task<UserClient> Login(bool relogin, string account)
+        private async Task<UserClient> Login(string defaultAccount)
         {
-            if (relogin)
+            Login login = new Login(defaultAccount);
+            if (login.ShowDialog() != DialogResult.OK || !(login.Client?.LoggedIn ?? false))
             {
-                if (MessageBox.Show($"帐号 {account} 已掉线，是否请重新登录", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-                {
-                    return null;
-                }
+                return null;
             }
 
-            Login login = new Login(account);
-            if (login.ShowDialog() == DialogResult.OK && (login.Client?.LoggedIn ?? false))
-            {
-                var userClient = await SaveUser(login.Client);
-                var user = userClient.User;
-
-                if (Appsetting.Instance.Clients.Count == 1)
-                {
-                    SetCurrentClient(Appsetting.Instance.Clients[0]);
-                }
+            var client = login.Client;
+            client.SetLanguage(Language.Schinese);
 
-                AddUserPanel(userClient);
+            var account = await client.GetAccountNameAsync();
 
-                return userClient;
-            }
+            var players = await SteamApi.QueryPlayerSummariesAsync(null, client.WebApiToken, new[] { client.SteamId });
+            var player = players.Body?.Players?.FirstOrDefault();
 
-            return null;
-        }
+            var localUser = Appsetting.Instance.Manifest.GetSteamUser(client.SteamId);
 
-        private async Task<UserClient> SaveUser(SteamCommunityClient client)
-        {
-            if (client?.LoggedIn ?? false)
+            var user = new User
             {
-                var localUser = Appsetting.Instance.Manifest.GetSteamUser(client.SteamId);
-
-                client.SetLanguage(Language.Schinese);
+                Account = !string.IsNullOrWhiteSpace(account) ? account : localUser?.Account,
 
-                var players = await SteamApi.QueryPlayerSummariesAsync(null, client.WebApiToken, new[] { client.SteamId });
-                var player = players.Body?.Players?.FirstOrDefault();
+                SteamId = client.SteamId,
+                RefreshToken = client.RefreshToken,
 
-                string account = await client.GetAccountNameAsync();
-                var user = new User
-                {
-                    Account = !string.IsNullOrWhiteSpace(account) ? account : localUser?.Account,
-
-                    SteamId = client.SteamId,
-                    RefreshToken = client.RefreshToken,
-
-                    NickName = player?.SteamName ?? localUser?.NickName ?? client.SteamId,
-                    Avatar = player?.AvatarFull ?? localUser?.Avatar ?? "",
-
-                    Setting = localUser?.Setting ?? new Model.UserSetting()
-                };
-
-                UserClient userClient = new UserClient(user, client, true);
+                NickName = player?.SteamName ?? localUser?.NickName ?? client.SteamId,
+                Avatar = player?.AvatarFull ?? localUser?.Avatar ?? "",
 
-                Appsetting.Instance.Manifest.SaveSteamUser(client.SteamId, user);
+                Setting = localUser?.Setting ?? new Model.UserSetting()
+            };
+            UserClient userClient = new UserClient(user, client, true);
 
-                Appsetting.Instance.Clients.RemoveAll(c => c.User.SteamId == user.SteamId);
-                Appsetting.Instance.Clients.Add(userClient);
-                return userClient;
+            Appsetting.Instance.Manifest.SaveSteamUser(client.SteamId, user);
+            Appsetting.Instance.Clients.RemoveAll(c => c.User.SteamId == user.SteamId);
+            Appsetting.Instance.Clients.Add(userClient);
 
-            }
-            return null;
-        }
+            AddUserPanel(userClient);
 
-        private async Task SwitchUser(UserClient userClient)
-        {
-            try
+            if (Appsetting.Instance.Clients.Count == 1 || currentClient.User.SteamId == userClient.User.SteamId)
             {
-                if (!userClient.Client.LoggedIn)
-                {
-                    if (!await userClient.LoginAsync())
-                    {
-                        userClient = await Login(true, userClient.GetAccount()) ?? userClient;
-                    }
-                }
-
                 SetCurrentClient(userClient);
             }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"切换用户失败{Environment.NewLine}{ex.Message}", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
+            return userClient;
         }
 
-        private void SetCurrentClient(UserClient userClient, bool reload = false)
+        private void SetCurrentClient(UserClient userClient)
         {
-            if (!reload)
+            try
             {
                 if (userClient?.User?.SteamId == currentClient?.User?.SteamId && userClient.Client.LoggedIn == currentClient?.Client.LoggedIn)
                 {
                     return;
                 }
-            }
 
-            usersPanel.SetChecked(userClient, true);
+                usersPanel.SetChecked(userClient, true);
 
-            UserName.Text = userClient?.User == null ? "---" : $"{userClient.GetAccount()} [{userClient.User.NickName}]";
-            SteamId.Text = userClient?.User == null ? "---" : $"{userClient.User.SteamId}";
+                UserName.Text = userClient?.User == null ? "---" : $"{userClient.GetAccount()} [{userClient.User.NickName}]";
+                SteamId.Text = userClient?.User == null ? "---" : $"{userClient.User.SteamId}";
 
-            UserImg.Image = Properties.Resources.userimg;
-            if (!string.IsNullOrWhiteSpace(userClient?.User?.Avatar))
-            {
-                UserImg.LoadAsync(userClient.User.Avatar);
-            }
+                UserImg.Image = Properties.Resources.userimg;
+                if (!string.IsNullOrWhiteSpace(userClient?.User?.Avatar))
+                {
+                    UserImg.LoadAsync(userClient.User.Avatar);
+                }
 
-            Balance.Text = "---";
-            DelayedBalance.Text = "---";
-            OfferCountLabel.Text = "---";
-            ConfirmationCountLable.Text = "---";
+                Balance.Text = "---";
+                DelayedBalance.Text = "---";
+                OfferCountLabel.Text = "---";
+                ConfirmationCountLable.Text = "---";
 
-            currentClient = userClient;
-            Appsetting.Instance.AppSetting.Entry.CurrentUser = currentClient.User.SteamId;
-            Appsetting.Instance.AppSetting.Save();
+                currentClient = userClient;
+                Appsetting.Instance.AppSetting.Entry.CurrentUser = currentClient?.User?.SteamId;
+                Appsetting.Instance.AppSetting.Save();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"切换用户失败{Environment.NewLine}{ex.Message}", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
 
         private SteamUserPanel AddUserPanel(UserClient userClient)
@@ -415,7 +378,7 @@ private SteamUserPanel AddUserPanel(UserClient userClient)
 
                 if (client.User.SteamId == currentClient?.User?.SteamId)
                 {
-                    SetCurrentClient(client, true);
+                    SetCurrentClient(client);
                 }
             };
 
diff --git a/SteamAuthenticator/Handler/BUFFUserPanelHandler.cs b/SteamAuthenticator/Handler/BUFFUserPanelHandler.cs
@@ -105,6 +105,7 @@ private BuffUserPanel AddUserPanel(BuffClient buffClient)
             BuffUserPanel panel = UsersPanel.AddItemPanel(true, buffClient);
 
             panel.ItemIcon.ContextMenuStrip = UserMenu;
+            panel.ItemIcon.MouseClick += user_MouseClick;
 
             panel.Client
                 .WithStartLogin(() =>
@@ -118,5 +119,23 @@ private BuffUserPanel AddUserPanel(BuffClient buffClient)
 
             return panel;
         }
+
+        private async void user_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left)
+            {
+                return;
+            }
+
+            var control = sender as Control;
+            var userPanel = control.Parent as BuffUserPanel;
+            var userClient = userPanel.Client;
+            if (userClient.LoggedIn)
+            {
+                return;
+            }
+
+            await ReloginInternal(userPanel, userClient);
+        }
     }
 }
diff --git a/SteamAuthenticator/Handler/C5UserPanelHandler.cs b/SteamAuthenticator/Handler/C5UserPanelHandler.cs
@@ -100,6 +100,7 @@ private C5UserPanel AddUserPanel(C5Client client)
             };
 
             panel.ItemIcon.ContextMenuStrip = userMenu;
+            panel.ItemIcon.MouseClick += user_MouseClick;
 
             panel.Client
                 .WithStartLogin(() =>
@@ -140,12 +141,17 @@ private async Task<C5UserPanel> Login(string tips)
 
             var userInfo = userResponse.Body.data;
 
+            var localUser = Appsetting.Instance.Manifest.GetC5User(userInfo.uid);
+
             var user = new C5User
             {
                 UserId = userInfo.uid,
                 Nickname = userInfo.nickname,
                 Avatar = userInfo.avatar,
                 SteamIds = userInfo.steamList.Select(c => c.steamId)?.ToList() ?? new List<string>(),
+
+                Setting = localUser?.Setting ?? new C5UserSetting(),
+
                 AppKey = appkey
             };
             var client = new C5Client(user, true)
@@ -216,5 +222,23 @@ private void AutoDeliver(object _)
                 autoDeliverTimer?.Change(autoDeliverTimerMinPeriod, autoDeliverTimerMinPeriod * 3);
             }
         }
+
+        private async void user_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left)
+            {
+                return;
+            }
+
+            var control = sender as Control;
+            var userPanel = control.Parent as C5UserPanel;
+            var userClient = userPanel.Client;
+            if (userClient.LoggedIn)
+            {
+                return;
+            }
+
+            await ReloginInternal(userPanel, userClient);
+        }
     }
 }
diff --git a/SteamAuthenticator/Handler/ECOUserPanelHandler.cs b/SteamAuthenticator/Handler/ECOUserPanelHandler.cs
@@ -99,6 +99,8 @@ private async Task<EcoUserPanel> EcoLogin(string tips)
             var steamUserResponse = await EcoApi.QuerySteamUserAsync(authResponse.Token);
             var steamUserData = steamUserResponse?.StatusData?.ResultData;
 
+            var localUser = Appsetting.Instance.Manifest.GetEcoUser(authResponse.UserId);
+
             var user = new EcoUser
             {
                 UserId = authResponse.UserId,
@@ -107,6 +109,8 @@ private async Task<EcoUserPanel> EcoLogin(string tips)
                 SteamIds = steamUserData?.Select(c => c.SteamId).ToList() ?? new List<string>(),
                 ClientId = authResponse.ClientId,
 
+                Setting = localUser?.Setting ?? new EcoUserSetting(),
+
                 RefreshToken = authResponse.RefreshToken,
                 RefreshTokenExpireTime = authResponse.RefreshTokenExpireDate
             };
@@ -136,6 +140,7 @@ private EcoUserPanel AddUserPanel(EcoClient client)
             };
 
             panel.ItemIcon.ContextMenuStrip = userMenu;
+            panel.ItemIcon.MouseClick += user_MouseClick;
 
             panel.Client
                 .WithStartLogin(() =>
@@ -207,5 +212,23 @@ private void AutoDeliver(object _)
                 autoDeliverTimer?.Change(autoDeliverTimerMinPeriod, autoDeliverTimerMinPeriod * 3);
             }
         }
+
+        private async void user_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left)
+            {
+                return;
+            }
+
+            var control = sender as Control;
+            var userPanel = control.Parent as EcoUserPanel;
+            var userClient = userPanel.Client;
+            if (userClient.LoggedIn)
+            {
+                return;
+            }
+
+            await ReloginInternal(userPanel, userClient);
+        }
     }
 }
diff --git a/SteamAuthenticator/Handler/YouPinUserPanelHandler.cs b/SteamAuthenticator/Handler/YouPinUserPanelHandler.cs
@@ -77,6 +77,7 @@ private YouPinUserPanel AddUserPanel(YouPinClient client)
             YouPinUserPanel panel = UsersPanel.AddItemPanel(true, client);
 
             panel.ItemIcon.ContextMenuStrip = UserMenu;
+            panel.ItemIcon.MouseClick += user_MouseClick;
 
             panel.Client
                 .WithStartLogin(() =>
@@ -117,5 +118,23 @@ private YouPinUserPanel YouPinLogin(string tips)
 
             return AddUserPanel(client);
         }
+
+        private async void user_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left)
+            {
+                return;
+            }
+
+            var control = sender as Control;
+            var userPanel = control.Parent as YouPinUserPanel;
+            var userClient = userPanel.Client;
+            if (userClient.LoggedIn)
+            {
+                return;
+            }
+
+            await ReloginInternal(userPanel, userClient);
+        }
     }
 }
