From be313984c763d17eadde3ce1a9ccff265ad34fea Mon Sep 17 00:00:00 2001
From: Aigio Liu <lysoft.pw@foxmail.com>
Date: Tue, 25 May 2021 22:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20UI=20=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/UI/Views/MainView.axaml       |   2 +-
 .../Windows/ChangeBindPhoneNumberWindow.axaml | 103 +++++++++---------
 .../UI/Views/Windows/UserProfileWindow.axaml  |   2 +-
 .../Models/Settings/AuthSettings.cs           |  46 --------
 .../Services/Mvvm/UserService.cs              |  46 ++++++--
 .../ChangeBindPhoneNumberWindowViewModel.cs   |  13 ---
 .../Windows/UserProfileWindowViewModel.cs     |   9 --
 7 files changed, 93 insertions(+), 128 deletions(-)
 delete mode 100644 src/ST.Client.Desktop/Models/Settings/AuthSettings.cs

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
index af3fb63be..272108938 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -91,7 +91,7 @@
                     </Image.Clip>-->
                   </Image>
                   <TextBlock
-                    Text="{ReflectionBinding Path=User.NickName,Source={x:Static service:UserService.Current}}"
+                    Text="{ReflectionBinding Path=User.NickName,Mode=OneWay,Source={x:Static service:UserService.Current}}"
                     FontSize="14"
                     HorizontalAlignment="Center"
                     Foreground="{DynamicResource HighlightForegroundBrushKey}"></TextBlock>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml
index 73fa230ae..58c9ca9d2 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangeBindPhoneNumberWindow.axaml
@@ -10,6 +10,7 @@
         x:Class="System.Application.UI.Views.Windows.ChangeBindPhoneNumberWindow"
         xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
         xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
+        xmlns:service="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client.Desktop"
         xmlns:ccl_services="clr-namespace:System.Application.Services;assembly=System.Application.SteamTools.Client"
         xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
         xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop"
@@ -22,68 +23,68 @@
         x:DataType="vm:ChangeBindPhoneNumberWindowViewModel"
         x:CompileBindings="True"
         Title="{Binding Title}">
-    <Panel>
-        <controls:TitleBar />
-        <Panel Margin="{StaticResource UnifyTitleBarAfterContentMargin}">
-            <controls:ProgressRing IsIndeterminate="True" HorizontalAlignment="Stretch" Height="100" Width="100" IsVisible="{Binding IsLoading}" />
-            <!--<Grid RowDefinitions="*,Auto" IsVisible="{Binding !IsLoading}">-->
-            <StackPanel VerticalAlignment="Center" Spacing="10" IsVisible="{Binding !IsLoading}">
+  <Panel>
+    <controls:TitleBar />
+    <Panel Margin="{StaticResource UnifyTitleBarAfterContentMargin}">
+      <controls:ProgressRing IsIndeterminate="True" HorizontalAlignment="Stretch" Height="100" Width="100" IsVisible="{Binding IsLoading}" />
+      <!--<Grid RowDefinitions="*,Auto" IsVisible="{Binding !IsLoading}">-->
+      <StackPanel VerticalAlignment="Center" Spacing="10" IsVisible="{Binding !IsLoading}">
 
-                <TextBox Watermark="{Binding CurrentPhoneNumber,Mode=OneWay}" IsReadOnly="True" Focusable="False" />
+        <TextBox Watermark="{ReflectionBinding Path=PhoneNumber,Mode=OneWay,Source={x:Static service:UserService.Current}}" IsReadOnly="True" Focusable="False" />
 
-                <Panel>
-                    <TextBox
-                      x:Name="TbSmsCodeValidation"
-                      Text="{Binding SmsCodeValidation}"
-                      Watermark="{ReflectionBinding Path=Res.User_SMSCode,Mode=OneWay,Source={x:Static resx:R.Current}}"
-                      MaxLength="{ReflectionBinding Path=SMS_CAPTCHA,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"
-                      IsEnabled="{Binding CurrentStepIsValidation}" />
-                    <Border HorizontalAlignment="Right" Cursor="Hand">
-                        <Button Classes="CodeButton"
-                                Content="{Binding BtnSendSmsCodeTextValidation}"
-                                Command="{ReflectionBinding SendSms}"
-                                IsEnabled="{Binding !IsUnTimeLimitValidation}" />
-                    </Border>
-                </Panel>
+        <Panel>
+          <TextBox
+            x:Name="TbSmsCodeValidation"
+            Text="{Binding SmsCodeValidation}"
+            Watermark="{ReflectionBinding Path=Res.User_SMSCode,Mode=OneWay,Source={x:Static resx:R.Current}}"
+            MaxLength="{ReflectionBinding Path=SMS_CAPTCHA,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"
+            IsEnabled="{Binding CurrentStepIsValidation}" />
+          <Border HorizontalAlignment="Right" Cursor="Hand">
+            <Button Classes="CodeButton"
+                    Content="{Binding BtnSendSmsCodeTextValidation}"
+                    Command="{ReflectionBinding SendSms}"
+                    IsEnabled="{Binding !IsUnTimeLimitValidation}" />
+          </Border>
+        </Panel>
 
-                <TextBox
-                  x:Name="TbPhoneNumber"
-                  Text="{Binding PhoneNumber}"
-                  Watermark="{ReflectionBinding Path=Res.User_NewPhone,Mode=OneWay,Source={x:Static resx:R.Current}}"
-                  IsEnabled="{Binding CurrentStepIsValidation}"
-                  MaxLength="{ReflectionBinding Path=PhoneNumber,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}" />
+        <TextBox
+          x:Name="TbPhoneNumber"
+          Text="{Binding PhoneNumber}"
+          Watermark="{ReflectionBinding Path=Res.User_NewPhone,Mode=OneWay,Source={x:Static resx:R.Current}}"
+          IsEnabled="{Binding CurrentStepIsValidation}"
+          MaxLength="{ReflectionBinding Path=PhoneNumber,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}" />
 
-                <Panel>
-                    <TextBox
-                      x:Name="TbSmsCodeNew"
-                      Text="{Binding SmsCodeNew}"
-                      Watermark="{ReflectionBinding Path=Res.User_SMSCode,Mode=OneWay,Source={x:Static resx:R.Current}}"
-                      IsEnabled="{Binding CurrentStepIsNew}"
-                      MaxLength="{ReflectionBinding Path=SMS_CAPTCHA,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}" />
-                    <Border HorizontalAlignment="Right" Cursor="Hand">
-                        <Button Classes="CodeButton"
-                                Content="{Binding BtnSendSmsCodeTextNew}"
-                                Command="{ReflectionBinding SendSms}"
-                                IsEnabled="{Binding !IsUnTimeLimitNew}" />
-                    </Border>
-                </Panel>
+        <Panel>
+          <TextBox
+            x:Name="TbSmsCodeNew"
+            Text="{Binding SmsCodeNew}"
+            Watermark="{ReflectionBinding Path=Res.User_SMSCode,Mode=OneWay,Source={x:Static resx:R.Current}}"
+            IsEnabled="{Binding CurrentStepIsNew}"
+            MaxLength="{ReflectionBinding Path=SMS_CAPTCHA,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}" />
+          <Border HorizontalAlignment="Right" Cursor="Hand">
+            <Button Classes="CodeButton"
+                    Content="{Binding BtnSendSmsCodeTextNew}"
+                    Command="{ReflectionBinding SendSms}"
+                    IsEnabled="{Binding !IsUnTimeLimitNew}" />
+          </Border>
+        </Panel>
 
-                <Button Classes="action"
-                  Content="{Binding BtnSubmitText}"
-                  Command="{ReflectionBinding Submit}"
-                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" />
+        <Button Classes="action"
+          Content="{Binding BtnSubmitText}"
+          Command="{ReflectionBinding Submit}"
+                HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" />
 
-            </StackPanel>
+      </StackPanel>
 
-            <!--<StackPanel Grid.Row="1">
+      <!--<StackPanel Grid.Row="1">
         <Button
                 HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" BorderThickness="0" Cursor="Hand">
           <TextBlock Text="遇到问题？"></TextBlock>
         </Button>
       </StackPanel>-->
-            <!--</Grid>-->
-        </Panel>
-        <!--Toast-->
-        <controls:ToastMessage />
+      <!--</Grid>-->
     </Panel>
+    <!--Toast-->
+    <controls:ToastMessage />
+  </Panel>
 </Window>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml
index 7c1ddefe3..ab8e7f2a9 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml
@@ -129,7 +129,7 @@
                            Grid.Row="3"/>
                 <TextBox IsReadOnly="True"
                          Focusable="False"
-                         Watermark="{Binding CurrentPhoneNumber,Mode=OneWay}"
+                         Watermark="{ReflectionBinding Path=PhoneNumber,Mode=OneWay,Source={x:Static service:UserService.Current}}"
                          Grid.Row="3"
                          Grid.Column="1"
                          MaxLength="{ReflectionBinding Path=PhoneNumber,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"/>
diff --git a/src/ST.Client.Desktop/Models/Settings/AuthSettings.cs b/src/ST.Client.Desktop/Models/Settings/AuthSettings.cs
deleted file mode 100644
index 79e67c541..000000000
--- a/src/ST.Client.Desktop/Models/Settings/AuthSettings.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Application.Serialization;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-namespace System.Application.Models.Settings
-{
-    public static class AuthSettings
-    {
-        static AuthSettings()
-        {
-            Authenticators.ValueChanged += Authenticators_ValueChanged;
-        }
-
-        private static void Authenticators_ValueChanged(object sender, ValueChangedEventArgs<string> e)
-        {
-            if (e.NewValue != e.OldValue)
-            {
-                if (AuthSettings.IsCurrentDirectorySaveAuthData.Value)
-                {
-                    File.WriteAllText(Path.Combine(IOPath.AppDataDirectory, Constants.AUTHDATA_FILE), e.NewValue);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 令牌数据(压缩存储）
-        /// </summary>
-        public static SerializableProperty<string> Authenticators { get; }
-            = new SerializableProperty<string>(GetKey(), Providers.Local) { AutoSave = true };
-
-        /// <summary>
-        /// 是否将令牌数据存储在程序路径下
-        /// </summary>
-        public static SerializableProperty<bool> IsCurrentDirectorySaveAuthData { get; }
-            = new SerializableProperty<bool>(GetKey(), Providers.Local, false) { AutoSave = true };
-
-        private static string GetKey([CallerMemberName] string propertyName = "")
-        {
-            return nameof(AuthSettings) + "." + propertyName;
-        }
-    }
-}
diff --git a/src/ST.Client.Desktop/Services/Mvvm/UserService.cs b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
index 0fe6b0535..5bcb576ba 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
@@ -150,15 +150,41 @@ namespace System.Application.Services
         }
 
         bool _HasPhoneNumber;
+        /// <summary>
+        /// 当前登录用户是否有手机号码
+        /// </summary>
         public bool HasPhoneNumber
         {
             get => _HasPhoneNumber;
             set => this.RaiseAndSetIfChanged(ref _HasPhoneNumber, value);
         }
 
-        public async Task RefreshUserAsync()
+        string _PhoneNumber = string.Empty;
+        /// <summary>
+        /// 用于 UI 显示的当前登录用户的手机号码(隐藏中间四位)
+        /// </summary>
+        public string PhoneNumber
         {
-            User = await userManager.GetCurrentUserInfoAsync();
+            get => _PhoneNumber;
+            set => this.RaiseAndSetIfChanged(ref _PhoneNumber, value);
+        }
+
+        static string GetCurrentUserPhoneNumber(CurrentUser? user, bool notHideMiddleFour = false)
+        {
+            var phone_number = user?.PhoneNumber;
+            if (string.IsNullOrWhiteSpace(phone_number)) return AppResources.Unbound;
+            return notHideMiddleFour ? phone_number : PhoneNumberHelper.ToStringHideMiddleFour(phone_number);
+        }
+
+        public void RefreshCurrentUser(CurrentUser? currentUser)
+        {
+            PhoneNumber = GetCurrentUserPhoneNumber(currentUser);
+            HasPhoneNumber = !string.IsNullOrWhiteSpace(currentUser?.PhoneNumber);
+        }
+
+        public async Task RefreshUserAsync(UserInfoDTO? user)
+        {
+            User = user;
             this.RaisePropertyChanged(nameof(IsAuthenticated));
 
             if (User != null && User.SteamAccountId.HasValue)
@@ -172,8 +198,14 @@ namespace System.Application.Services
                 AvaterPath = DefaultAvaterPath;
             }
 
-            var userInfo = await userManager.GetCurrentUserAsync();
-            HasPhoneNumber = !string.IsNullOrWhiteSpace(userInfo?.PhoneNumber);
+            var currentUser = await userManager.GetCurrentUserAsync();
+            RefreshCurrentUser(currentUser);
+        }
+
+        public async Task RefreshUserAsync()
+        {
+            var user = await userManager.GetCurrentUserInfoAsync();
+            await RefreshUserAsync(user);
         }
 
         /// <summary>
@@ -187,7 +219,7 @@ namespace System.Application.Services
             if (user == null) return;
             user.PhoneNumber = phoneNumber;
             await userManager.SetCurrentUserAsync(user);
-            HasPhoneNumber = true;
+            RefreshCurrentUser(user);
         }
 
         /// <summary>
@@ -217,7 +249,7 @@ namespace System.Application.Services
                     return;
             }
             await userManager.SetCurrentUserInfoAsync(user, true);
-            User = user;
+            await RefreshUserAsync(user);
         }
 
         /// <summary>
@@ -248,7 +280,7 @@ namespace System.Application.Services
                     return;
             }
             await userManager.SetCurrentUserInfoAsync(user, true);
-            User = user;
+            await RefreshUserAsync(user);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs
index b28efdfd1..6c153e50f 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangeBindPhoneNumberWindowViewModel.cs
@@ -21,12 +21,6 @@ namespace System.Application.UI.ViewModels
                 { Step.Validation, new SendSmsUIViewModelValidation(this) },
                 { Step.New, new SendSmsUIViewModelNew(this) },
             };
-            Initialize();
-        }
-
-        public async void Initialize()
-        {
-            CurrentPhoneNumber = await DI.Get<IUserManager>().GetCurrentUserPhoneNumberAsync();
         }
 
         bool _IsLoading;
@@ -36,13 +30,6 @@ namespace System.Application.UI.ViewModels
             set => this.RaiseAndSetIfChanged(ref _IsLoading, value);
         }
 
-        string? _CurrentPhoneNumber;
-        public string? CurrentPhoneNumber
-        {
-            get => _CurrentPhoneNumber;
-            set => this.RaiseAndSetIfChanged(ref _CurrentPhoneNumber, value);
-        }
-
         string? _SmsCodeValidation;
         public string? SmsCodeValidation
         {
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs
index 94743b621..4c9a90045 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs
@@ -35,8 +35,6 @@ namespace System.Application.UI.ViewModels
                 if (userInfoSource.AreaId.HasValue) this.SetAreaId(userInfoSource.AreaId.Value);
 
                 userInfoSource = Serializable.DMP<UserInfoDTO>(userInfoValue) ?? throw new ArgumentNullException(nameof(userInfoSource));
-                _CurrentPhoneNumber = await userManager.GetCurrentUserPhoneNumberAsync();
-                if (string.IsNullOrWhiteSpace(_CurrentPhoneNumber)) _CurrentPhoneNumber = AppResources.Unbound;
 
                 // IsModifySubscribe
                 void SubscribeOnNext<T>(T value, Action<T> onNext)
@@ -97,13 +95,6 @@ namespace System.Application.UI.ViewModels
             set => this.RaiseAndSetIfChanged(ref _NickName, value);
         }
 
-        string? _CurrentPhoneNumber;
-        public string? CurrentPhoneNumber
-        {
-            get => _CurrentPhoneNumber;
-            set => this.RaiseAndSetIfChanged(ref _CurrentPhoneNumber, value);
-        }
-
         Gender _Gender;
         public Gender Gender
         {