Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/Helper/ServiceHelper.cs

@@ -138,6 +138,7 @@ namespace PDF_Office.Helper
         }
 
 
+        //超时同步为20秒
         public static String GetUser()
         {
            

PDF Office/PDF Office.csproj

@@ -868,6 +868,9 @@
     <Compile Include="Views\Dialog\ServiceDialog\UserDialog.xaml.cs">
       <DependentUpon>UserDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Dialog\ServiceDialog\UserOut.xaml.cs">
+      <DependentUpon>UserOut.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Dialog\ServiceDialog\UserOutCodeRegion.xaml.cs">
       <DependentUpon>UserOutCodeRegion.xaml</DependentUpon>
     </Compile>
@@ -1643,6 +1646,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Dialog\ServiceDialog\UserOut.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Dialog\ServiceDialog\UserOutCodeRegion.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

PDF Office/ViewModels/Dialog/ServiceDialog/CodeRegionViewModel.cs

@@ -21,11 +21,9 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         private LoginDialogViewModel LoginDialogViewModel;
         public IDialogService dialogs;
 
-
+        //60秒倒计时
         private int time = 60;
 
-
-
         private bool _EnableNextStep = true;
         public bool EnableNextStep
         {
@@ -68,7 +66,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code1
         {
             get { return _Code1; }
-            set { SetProperty(ref _Code1, value); }
+            set { SetProperty(ref _Code1, value);
+               if( CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
 
@@ -77,7 +81,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code2
         {
             get { return _Code2; }
-            set { SetProperty(ref _Code2, value); }
+            set { SetProperty(ref _Code2, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
 
@@ -86,7 +96,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code3
         {
             get { return _Code3; }
-            set { SetProperty(ref _Code3, value); }
+            set { SetProperty(ref _Code3, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
         private string _Code4 = "";
@@ -94,7 +110,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code4
         {
             get { return _Code4; }
-            set { SetProperty(ref _Code4, value); }
+            set { SetProperty(ref _Code4, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
 
@@ -104,7 +126,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code5
         {
             get { return _Code5; }
-            set { SetProperty(ref _Code5, value); }
+            set { SetProperty(ref _Code5, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
         private string _Code6 = "";
@@ -117,6 +145,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         private string _RegisterCodemsg = "";
 
+
         public string RegisterCodemsg
         {
             get { return _RegisterCodemsg; }
@@ -182,6 +211,8 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public DelegateCommand CodetooCommand { get; set; }
         public DelegateCommand Code6ChangedCommand { get; set; }
         public DelegateCommand RegisterNextCommand { get; set; }
+        public DelegateCommand CloseDialogCommand { get; set; }
+
 
         public CodeRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -193,6 +224,8 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             CodetooCommand = new DelegateCommand(Codetoo);
             Code6ChangedCommand = new DelegateCommand(Code6Changed);
             RegisterNextCommand = new DelegateCommand(RegisterNext);
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+
             if (LoginDialogViewModel != null && LoginDialogViewModel.IsReset == true)
             {
                 CodeType = "user_reset_password";
@@ -213,6 +246,38 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
             }
         }
+
+        private void CloseDialog()
+        {
+            if (CodeType == "user_register")
+            {
+                RegisterDialogViewModel.Close();
+            }
+            else if (CodeType == "user_reset_password")
+            {
+                LoginDialogViewModel.Close();
+            }
+           
+
+        }
+        private bool CodeSum()
+        {
+            Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
+            if(Codesum.Length==6)
+            {
+                return true;
+
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+
+
+        //下一步按钮
         private void RegisterNext()
         {
            
@@ -265,12 +330,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             
         }
 
+        //第六个密码框改变
         private void Code6Changed()
         {
            if(Code6.Length==1)
             {
-                Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
-                if (Codesum.Length == 6)
+               ;
+                if (CodeSum() ==true)
                 {
                     if (CodeType == "user_register")
                     {
@@ -280,6 +346,9 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                             
                             if (ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid) == "success")
                             {
+                                App.mainWindowViewModel.UserVis = Visibility.Visible;
+                                App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
+                                App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
                                 RegisterDialogViewModel.RegionMan("RegisterOKRegion");
                             }
                             else
@@ -319,6 +388,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             }
         }
 
+        //重发密码
         private void Codetoo()
         {
             time = 60;
@@ -326,7 +396,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             ServiceHelper.Get_code(CodeType, RegisterDialogViewModel.RegisterEmail);
         }
 
-
+        //计数
         public void disTimer_Tick(object sender, EventArgs e)
         {
            
@@ -342,6 +412,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             }
         }
 
+        //计时器
         private DispatcherTimer disTimer = new DispatcherTimer();
         public void Timebegin()
         {
@@ -352,12 +423,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             disTimer.Start();//计时开始
         }
 
-
-
-
-
-
-
+        //判断验证类型
         private void BackRegisterLast()
         {
             if(CodeType== "user_register")

PDF Office/ViewModels/Dialog/ServiceDialog/LoginPasswordRegionViewModel.cs

@@ -1,5 +1,7 @@
-using PDF_Office.Helper;
+using PDF_Office.CustomControl;
+using PDF_Office.Helper;
 using PDF_Office.Model;
+using PDF_Office.Views.Dialog.ServiceDialog;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -12,6 +14,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Navigation;
 
 namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 {
@@ -79,6 +83,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             set
             {
                 SetProperty(ref _LoginPassword, value);
+                LoginPasswordmsglook = "";
                 LoginPasswordlookVis = Visibility.Collapsed;
                 if (string.IsNullOrEmpty(LoginPassword))
                 {
@@ -161,6 +166,8 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public DelegateCommand LoginCommand { get; set; }
         public DelegateCommand LinkLicenseCommand { get; set; }
         public DelegateCommand LoginPasswordChangedCommand { get; set; }
+        public DelegateCommand CloseDialogCommand { get; set; }
+
         LoginPasswordRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             dialogs = dialogService;
@@ -170,7 +177,18 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             ChangeEmailCommand = new DelegateCommand(ChangeEmail);
             GoCodeUpdataCommand = new DelegateCommand(GoCodeUpdata);
             LoginPasswordChangedCommand = new DelegateCommand(LoginPasswordChanged);
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+
+        }
+
+        private void CloseDialog()
+        {
+
+            LoginDialogViewModel.Close();
+
         }
+
+        //密码改变
         private void LoginPasswordChanged()
         {
 
@@ -190,7 +208,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         }
 
 
-
+        //获取忘记密码验证码
         private void GoCodeUpdata()
         {
             ServiceHelper.Get_code("user_reset_password", LoginEmail);
@@ -200,7 +218,9 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
           
            
         }
+       
 
+        //登录
         private void Login()
         {
             
@@ -212,6 +232,11 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                 App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                 App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
             }
+            else if(ServiceHelper.Login(LoginEmail, LoginPassword, uuid) == "网络不稳定请重试")
+            {
+                LoginDialogViewModel.RegionMan("NOInternetRegion");
+            }
+           
             else
             {
                 LoginPasswordmsglook = ServiceHelper.Login(LoginEmail, LoginPassword, uuid);

PDF Office/ViewModels/Dialog/ServiceDialog/LoginRegionViewModel.cs

@@ -1,5 +1,7 @@
-using PDF_Office.Helper;
+using PDF_Office.CustomControl;
+using PDF_Office.Helper;
 using PDF_Office.Model;
+using PDF_Office.Views.Dialog.ServiceDialog;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -13,6 +15,8 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Navigation;
 
 namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 {
@@ -105,6 +109,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand LoginNextCommand { get; set; }
         public DelegateCommand GoLoginCommand { get; set; }
+        public DelegateCommand CloseDialogCommand { get; set; }
 
         LoginRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -112,8 +117,15 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
           
             LoginNextCommand = new DelegateCommand(LoginNext);
             GoLoginCommand = new DelegateCommand(GoLogin);
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
         }
 
+        private void CloseDialog()
+        {
+
+            LoginDialogViewModel.Close();
+
+        }
 
         private void LoginNext()
         {
@@ -124,6 +136,16 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                 LoginDialogViewModel.LoginEmail = LoginEmail;
                 LoginDialogViewModel.RegionMan("LoginPasswordRegion");
             }
+            else if (ServiceHelper.Ok_email(LoginEmail, "1") == "注销中，无法登录，若有问题可联系客服")
+            {
+                UserOut window = new UserOut() ;
+                window.ShowDialog();
+
+            }
+            else if (ServiceHelper.Ok_email(LoginEmail, "1") == "当前账号未注册，点击下一步我们将为您注册账号")
+            {
+                LoginEmaillook = "当前账号未注册";
+            }
             else
             {
                 LoginEmaillook = ServiceHelper.Ok_email(LoginEmail, "1");

PDF Office/ViewModels/Dialog/ServiceDialog/NoInternetRegionViewModel.cs

@@ -1,12 +1,65 @@
-using System;
+using PDF_Office.Helper;
+using PDF_Office.Model;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 {
-    class NoInternetRegionViewModel
+    public class NOInternetRegionViewModel : BindableBase, INavigationAware
     {
+        private LoginDialogViewModel LoginDialogViewModel;
+        public IDialogService dialogs;
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            navigationContext.Parameters.TryGetValue<LoginDialogViewModel>("LoginDialogViewModel", out LoginDialogViewModel);
+        }
+
+   
+        public DelegateCommand CloseDialogCommand { get; set; }
+        public DelegateCommand RetryCommand { get; set; }
+
+        NOInternetRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
+        {
+            dialogs = dialogService;        
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+            RetryCommand = new DelegateCommand(Retry);
+
+        }
+        private void Retry()
+        {
+            LoginDialogViewModel.RegionMan("LoginRegion");
+        }
+
+
+
+        private void CloseDialog()
+        {
+
+            LoginDialogViewModel.Close();
+
+        }
     }
 }

PDF Office/ViewModels/Dialog/ServiceDialog/PasswordUpdataRegionVIewModel.cs

@@ -85,6 +85,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             set
             {
                 SetProperty(ref _LoginPassword, value);
+                PasswordUpdatalookVis = Visibility.Collapsed;
                 if (string.IsNullOrEmpty(LoginPassword))
                 {
                     ChkVis = Visibility.Collapsed;
@@ -156,6 +157,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             set
             {
                 SetProperty(ref _LoginPassword2, value);
+                PasswordUpdatalookVis = Visibility.Collapsed;
                 if (string.IsNullOrEmpty(LoginPassword2))
                 {
                     ChkVis2 = Visibility.Collapsed;
@@ -239,6 +241,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand LoginPasswordChangedCommand { get; set; }
         public DelegateCommand LoginPasswordChanged2Command { get; set; }
+        public DelegateCommand CloseDialogCommand { get; set; }
         PasswordUpdataRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             dialogs = dialogService;
@@ -248,6 +251,16 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             PasswordUpdataCommand = new DelegateCommand(PasswordUpdata);
             LoginPasswordChangedCommand = new DelegateCommand(LoginPasswordChanged);
             LoginPasswordChanged2Command = new DelegateCommand(LoginPasswordChanged2);
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+
+        }
+
+
+        private void CloseDialog()
+        {
+
+           LoginDialogViewModel.Close();
+
         }
 
         private void LoginPasswordChanged()

PDF Office/ViewModels/Dialog/ServiceDialog/RegisterOKRegionViewModel.cs

@@ -41,7 +41,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         }
 
         public DelegateCommand RegisterGetStartCommand { get; set; }
-
+        public DelegateCommand CloseDialogCommand { get; set; }
 
         public RegisterOKRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -50,9 +50,14 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         
             dialogs = dialogService;
             RegisterGetStartCommand = new DelegateCommand(RegisterGetStart);
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+        }
+        private void CloseDialog()
+        {
+
+            RegisterDialogViewModel.Close();
 
         }
-       
 
         private void RegisterGetStart()
         {

PDF Office/ViewModels/Dialog/ServiceDialog/RegisterRegionViewModel.cs

@@ -294,9 +294,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                 RegisterDialogViewModel.RegisterPassword = RegisterPassword;
                 ServiceHelper.Get_code("user_register", RegisterEmail);
                 RegisterDialogViewModel.RegionMan( "CodeRegion");
-                App.mainWindowViewModel.UserVis = Visibility.Visible;
-                App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
             }
             else 
             {

PDF Office/ViewModels/Dialog/ServiceDialog/UserDialogViewModel.cs

@@ -64,6 +64,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand UserOutCommand { get; set; }
         public DelegateCommand LogOutCommand { get; set; }
+        public DelegateCommand CloseDialogCommand { get; set; }
 
         UserDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -71,12 +72,18 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             UserRegionName = Guid.NewGuid().ToString();
             UserOutCommand = new DelegateCommand(UserOut);
             LogOutCommand = new DelegateCommand(LogOut);
-            if(ServiceHelper.ALLEmail!="")
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+            if (ServiceHelper.ALLEmail!="")
             {
                 UserEmail = ServiceHelper.ALLEmail;
             }
         }
+        private void CloseDialog()
+        {
+
+           this.Close();
 
+        }
         public void UserOut()
         {
             AlertsMessage alertsMessage = new AlertsMessage();

PDF Office/ViewModels/Dialog/ServiceDialog/UserOutCodeRegionViewModel.cs

@@ -53,7 +53,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code1
         {
             get { return _Code1; }
-            set { SetProperty(ref _Code1, value); }
+            set { SetProperty(ref _Code1, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
 
@@ -62,7 +68,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code2
         {
             get { return _Code2; }
-            set { SetProperty(ref _Code2, value); }
+            set { SetProperty(ref _Code2, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
 
@@ -71,7 +83,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code3
         {
             get { return _Code3; }
-            set { SetProperty(ref _Code3, value); }
+            set { SetProperty(ref _Code3, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
         private string _Code4 = "";
@@ -79,7 +97,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code4
         {
             get { return _Code4; }
-            set { SetProperty(ref _Code4, value); }
+            set { SetProperty(ref _Code4, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
 
@@ -89,7 +113,13 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code5
         {
             get { return _Code5; }
-            set { SetProperty(ref _Code5, value); }
+            set { SetProperty(ref _Code5, value);
+                if (CodeSum())
+                {
+                    Code6Changed();
+
+                }
+            }
         }
 
         private string _Code6 = "";
@@ -97,7 +127,8 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public string Code6
         {
             get { return _Code6; }
-            set { SetProperty(ref _Code6, value); }
+            set { SetProperty(ref _Code6, value);
+            }
         }
 
         private string _UserCodemsg = "";
@@ -146,7 +177,9 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public DelegateCommand CodetooCommand { get; set; }
         public DelegateCommand Code6ChangedCommand { get; set; }
         public DelegateCommand UserOutCommand { get; set; }
-       
+
+        public DelegateCommand CloseDialogCommand { get; set; }
+
         public UserOutCodeRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
 
@@ -157,9 +190,16 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             CodetooCommand = new DelegateCommand(Codetoo);
             Code6ChangedCommand = new DelegateCommand(Code6Changed);
             UserOutCommand = new DelegateCommand(UserOut);
-           
+            CloseDialogCommand = new DelegateCommand(CloseDialog);
+
+
         }
+        private void CloseDialog()
+        {
+
+            UserDialogViewModel.Close();
 
+        }
 
         private void UserOutCancel()
         {
@@ -168,7 +208,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
 
 
-
+        //注销
         private void UserOut()
         {
 
@@ -211,40 +251,55 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             }
 
         }
+        private bool CodeSum()
+        {
+            Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
+            if (Codesum.Length == 6)
+            {
+                return true;
+
+            }
+            else
+            {
+                return false;
+            }
+        }
+
 
         private void Code6Changed()
         {
             if (Code6.Length == 1)
             {
-               
-                if (ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off") == "success")
+                if (CodeSum() == true)
                 {
-                   
-                    if (ServiceHelper.Usergout(Codesum) == "success")
+                    if (ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off") == "success")
                     {
-                        UserDialogViewModel.Close();
+
+                        if (ServiceHelper.Usergout(Codesum) == "success")
+                        {
+                            UserDialogViewModel.Close();
+                        }
+                        else
+                        {
+                            UserCodemsg = ServiceHelper.Usergout(Codesum);
+                            UserCodemsgVis = Visibility.Visible;
+                        }
                     }
                     else
                     {
-                        UserCodemsg = ServiceHelper.Usergout(Codesum);
+                        UserCodemsg = ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off");
                         UserCodemsgVis = Visibility.Visible;
                     }
-                }
-                else
-                {
-                    UserCodemsg = ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off");
-                    UserCodemsgVis = Visibility.Visible;
-                }
 
 
 
-            }
-            else
+                }
+                else
                 {
                     UserCodemsg = "请输入六位数验证码";
-                   UserCodemsgVis = Visibility.Visible;
+                    UserCodemsgVis = Visibility.Visible;
+                }
             }
-
             
         }
 

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -235,7 +235,7 @@ namespace PDF_Office.ViewModels
                 }
                 else
                 {
-                    RegisterVis = Visibility.Visible;
+                    LoginVis = Visibility.Visible;
                 }
                
             }

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -320,6 +320,9 @@ namespace PDF_Office.ViewModels.PageEdit
             new Size(312,441)
         };
 
+        //选中的页面集合
+        private List<int> selectedPageList = new List<int>();
+
 
         #endregion
 
@@ -884,12 +887,12 @@ namespace PDF_Office.ViewModels.PageEdit
 
             if (TbPageRangeVisibility == Visibility.Visible && args != null)
             {
-                List<int> pagelist = new List<int>();
+                selectedPageList = new List<int>();
                 for (int i = 0; i < listbox.SelectedItems.Count; i++)
                 {
-                    if (!pagelist.Contains((listbox.SelectedItems[i] as PageEditItem).PageNumber))
+                    if (!selectedPageList.Contains((listbox.SelectedItems[i] as PageEditItem).PageNumber))
                     {
-                        pagelist.Add((listbox.SelectedItems[i] as PageEditItem).PageNumber);
+                        selectedPageList.Add((listbox.SelectedItems[i] as PageEditItem).PageNumber);
                     }
                 }
 
@@ -900,13 +903,13 @@ namespace PDF_Office.ViewModels.PageEdit
                 //    return;
                 //}
                 //只选中单个页面是，listselectedIndex 更准确
-                if (pagelist.Count == 1)
+                if (selectedPageList.Count == 1)
                 {
                     TbPageRange = (listSelecedIndex + 1).ToString();
                 }
                 else
                 {
-                    string pageparm = CommonHelper.GetPageParmFromList(pagelist);
+                    string pageparm = CommonHelper.GetPageParmFromList(selectedPageList);
                     TbPageRange = pageparm;
                 }
             }
@@ -995,10 +998,12 @@ namespace PDF_Office.ViewModels.PageEdit
 
         private void print()
         {
+            PDFViewer.GoToPage(listSelecedIndex);
             DialogParameters printValue = new DialogParameters();
             printValue.Add(ParameterNames.PDFViewer, PDFViewer);
             printValue.Add(ParameterNames.FilePath, PDFViewer.Document.FileName);
             printValue.Add(ParameterNames.PrintCurrentPage, PDFViewer.CurrentIndex);
+            printValue.Add(ParameterNames.PageList,selectedPageList);
             dialogs.ShowDialog(DialogNames.HomePagePrinterDialog, printValue, e => { });
         }
 

PDF Office/Views/Dialog/ServiceDialog/CodeRegion.xaml

@@ -12,201 +12,231 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <Grid Background="White">
-        <TextBlock
-            Width="Auto"
-            Height="28"
-            Margin="32,48,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="20"
-            FontStyle="Normal"
-            FontWeight="SemiBold"
-            Text="{Binding CodeTypeName}" />
-        <TextBlock
-            Width="162"
-            Height="22"
-            Margin="32,108,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="14"
-            FontStyle="Normal"
-            Text="Enter the verification code" />
-
-        <TextBox
-            x:Name="text_Code1"
-            Width="36"
-            Height="42"
-            Margin="32,138,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            KeyUp="text_Code1_KeyUp"
-            Text="{Binding Code1, Mode=TwoWay}"
-            TextChanged="Code_TextChanged" />
-        <TextBox
-            x:Name="text_Code2"
-            Width="36"
-            Height="42"
-            Margin="76,138,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-             KeyUp="text_Code2_KeyUp"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code2, Mode=TwoWay}"
-            TextChanged="text_Code2_TextChanged" />
-        <TextBox
-            x:Name="text_Code3"
-            Width="36"
-            Height="42"
-             KeyUp="text_Code3_KeyUp"
-            Margin="120,138,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code3, Mode=TwoWay}"
-            TextChanged="text_Code3_TextChanged" />
-        <TextBox
-            x:Name="text_Code4"
-            Width="36"
-            Height="42"
-            Margin="164,138,0,0"
-            Padding="10"
-             KeyUp="text_Code4_KeyUp"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code4, Mode=TwoWay}"
-            TextChanged="text_Code4_TextChanged" />
-
-        <TextBox
-            x:Name="text_Code5"
-            Width="36"
-            Height="42"
-             KeyUp="text_Code5_KeyUp"
-            Margin="208,138,0,0"
-            Padding="10"
+        <Button
+            Width="16"
+            Height="16"
+            Margin="287,17,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code5, Mode=TwoWay}"
-            TextChanged="text_Code5_TextChanged" />
-        <TextBox
-            x:Name="text_Code6"
-            Width="36"
-            Height="42"
-            Margin="252,138,0,0"
-            Padding="10"
-             KeyUp="text_Code6_KeyUp"
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+            <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+        </Button>
+        <Grid           
+            Margin="32,48,0,0"
             HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code6, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-            TextChanged="text_Code6_TextChanged">
-            <i:Interaction.Triggers>
-                <i:EventTrigger EventName="TextChanged">
-                    <i:InvokeCommandAction Command="{Binding Code6ChangedCommand}" />
-                </i:EventTrigger>
-            </i:Interaction.Triggers>
-        </TextBox>
+            VerticalAlignment="Top">
+            <StackPanel>
+                <TextBlock
+                    Width="Auto"
+                    Height="28"
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontStyle="Normal"
+                    FontWeight="SemiBold"
+                    Text="{Binding CodeTypeName}" />
+                <TextBlock
+                    Width="162"
+                    Height="22"
+                    Margin="0,32,0,0"
+                    HorizontalAlignment="Left"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    FontStyle="Normal"
+                    Text="Enter the verification code" />
+                <WrapPanel Margin="0,8,0,0" HorizontalAlignment="Left">
+                    <TextBox
+                        x:Name="text_Code1"
+                        Width="36"
+                        Height="42"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code1_KeyUp"
+                        Text="{Binding Code1, Mode=TwoWay}"
+                        TextChanged="Code_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code2"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code2_KeyUp"
+                        Text="{Binding Code2, Mode=TwoWay}"
+                        TextChanged="text_Code2_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code3"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code3_KeyUp"
+                        Text="{Binding Code3, Mode=TwoWay}"
+                        TextChanged="text_Code3_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code4"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code4_KeyUp"
+                        Text="{Binding Code4, Mode=TwoWay}"
+                        TextChanged="text_Code4_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code5"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code5_KeyUp"
+                        Text="{Binding Code5, Mode=TwoWay}"
+                        TextChanged="text_Code5_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code6"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code6_KeyUp"
+                        Text="{Binding Code6, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        TextChanged="text_Code6_TextChanged">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="TextChanged">
+                                <i:InvokeCommandAction Command="{Binding Code6ChangedCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                </WrapPanel>
+                <WrapPanel Margin="0,10,0,0">
+                    <TextBlock
+                        Width="190"
+                        Height="20"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Text="Didn't receive the verification code?" />
+                    <TextBlock
+                        Width="Auto"
+                        Height="20"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Foreground="#1770F4"
+                        LineHeight="20"
+                        Text="{Binding Codetime}" />
+                    <TextBlock
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Foreground="#1770F4"
+                        LineHeight="20"
+                        Visibility="{Binding Codeagin, Mode=TwoWay}">
+                        <Hyperlink Command="{Binding CodetooCommand}">Click to resend</Hyperlink>
+                    </TextBlock>
+                </WrapPanel>
+            </StackPanel>
+        </Grid>
 
-        <TextBlock
-            Width="190"
-            Height="20"
-            Margin="32,190,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="Didn't receive the verification code?" />
-        <TextBlock
-            Width="79"
-            Height="20"
-            Margin="226,190,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Foreground="#1770F4"
-            LineHeight="20"
-            Text="{Binding Codetime}" />
-        <TextBlock
-            Width="79"
-            Height="20"
-            Margin="226,190,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Foreground="#1770F4"
-            LineHeight="20"
-            Visibility="{Binding Codeagin, Mode=TwoWay}">
-            <Hyperlink Command="{Binding CodetooCommand}">Click to resend</Hyperlink>
-        </TextBlock>
-        <Button
-            x:Name="Btn_RegisterNext"
+        <Grid
             Width="262"
-            Height="32"
             Margin="32,240,0,0"
             HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Command="{Binding RegisterNextCommand}"
-            Content="Sign up"
-            IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-            Style="{StaticResource Btn.cta}" />
+            VerticalAlignment="Top">
+            <StackPanel>
+                <Button
+                    x:Name="Btn_RegisterNext"
+                    Width="262"
+                    Height="32"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Command="{Binding RegisterNextCommand}"
+                    Content="Sign up"
+                    IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
+                    Style="{StaticResource Btn.cta}" />
+                <TextBlock
+                    Width="114"
+                    Height="20"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    FontStyle="Normal"
+                    Foreground="#1770F4"
+                    LineHeight="20">
+                    <Hyperlink Command="{Binding BackRegisterLastCommand}">Back to previous step</Hyperlink>
+                </TextBlock>
+            </StackPanel>
 
-        <TextBlock
-            Width="114"
-            Height="20"
-            Margin="106,282,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Foreground="#1770F4"
-            LineHeight="20">
-            <Hyperlink Command="{Binding BackRegisterLastCommand}">Back to previous step</Hyperlink>
-        </TextBlock>
+        </Grid>
 
         <Grid
+            x:Name="Grid_RegisterVis"
             Width="326"
             Height="48"
-            Margin="0,372,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Visibility="{Binding RegisterCodemsgVis}"
-            Background="#FDC7C6" />
-        <TextBlock
-            Height="22"
-            Width="185"
-            Margin="32,385,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            LineHeight="22"
-            Text="{Binding RegisterCodemsg}" />
+            VerticalAlignment="Bottom"
+            Background="#FDC7C6"
+            Visibility="{Binding RegisterCodemsgVis, Mode=TwoWay}">
+            <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                <Border
+                    Margin="-1,-4,0,0"
+                    Width="14"
+                    Height="14"
+                    Background="#F3465B"
+                    CornerRadius="100">
+                    <Path
+                        Margin="-1,-4,0,0"
+                        Data="M7.25 8V13H8.75V8H7.25ZM7.25 14.5V16H8.75L8.75 14.5H7.25Z"
+                        Fill="White" />
+                </Border>
+                <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontFamily="Segoe UI"
+                FontSize="12"
+                FontStyle="Normal"
+                LineHeight="22"
+                Text="{Binding RegisterCodemsg, Mode=TwoWay}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+            </WrapPanel>
+          
+        </Grid>
+
 
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/ServiceDialog/CodeRegion.xaml.cs

@@ -36,6 +36,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
         }
         private void Code_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_RegisterVis.Visibility = Visibility.Collapsed;
             if (text_Code1.Text.Length == 1)
             {
                 text_Code2.Focus();
@@ -60,6 +61,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code2_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_RegisterVis.Visibility = Visibility.Collapsed;
             if (text_Code2.Text.Length == 1)
             {
                 text_Code3.Focus();
@@ -81,6 +83,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code3_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_RegisterVis.Visibility = Visibility.Collapsed;
             if (text_Code3.Text.Length == 1)
             {
                 text_Code4.Focus();
@@ -102,6 +105,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code4_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_RegisterVis.Visibility = Visibility.Collapsed;
             if (this.text_Code4.Text.Length == 1)
             {
                 this.text_Code5.Focus();
@@ -123,6 +127,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code5_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_RegisterVis.Visibility = Visibility.Collapsed;
             if (this.text_Code5.Text.Length == 1)
             {
                 this.text_Code6.Focus();
@@ -144,6 +149,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code6_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_RegisterVis.Visibility = Visibility.Collapsed;
             if (this.text_Code6.Text.Length == 1)
             {
                 text_Code6.Focus();

PDF Office/Views/Dialog/ServiceDialog/LoginPasswordRegion.xaml

@@ -4,9 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Office.Helper"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:PDF_Office.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:prism="http://prismlibrary.com/" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:prism="http://prismlibrary.com/"
     Width="326"
     Height="420"
     prism:ViewModelLocator.AutoWireViewModel="True"
@@ -273,156 +274,173 @@
             </Setter>
         </Style>
     </UserControl.Resources>
-    <Grid>
-        <Grid Background="White">
-            <TextBlock
-                Width="72"
-                Height="28"
-                Margin="32,48,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="20"
-                FontStyle="Normal"
-                FontWeight="SemiBold"
-                Text="Login" />
-            <Grid Margin="32,110,0,0" Height="20" VerticalAlignment="Top" HorizontalAlignment="Left" Width="Auto">
-                <WrapPanel>
-                    <TextBlock
-                Width="Auto"
-                Height="20"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="12"
-                LineHeight="20"
-                Foreground="#616469"
-                FontStyle="Normal"
-                Text="{Binding LoginEmail}" />
+    <Grid Background="White">
+        <Button
+            Width="16"
+            Height="16"
+            Margin="287,17,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+            <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+        </Button>
+        <Grid
+            Width="262"
+            Margin="0,48,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top">
+            <StackPanel>
                 <TextBlock
-                    Margin="8,0,0,0"
-                Width="73"
-                Height="20"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="12"
-                FontWeight="Normal"
-                Foreground="#1770F4"
-                LineHeight="20">
-                <Hyperlink Command="{Binding ChangeEmailCommand}">Change Email</Hyperlink>
+                    Width="72"
+                    Height="28"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontStyle="Normal"
+                    FontWeight="SemiBold"
+                    Text="Login" />
+                <WrapPanel Margin="0,34,0,0">
+                    <TextBlock
+                        Width="Auto"
+                        Height="20"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Foreground="#616469"
+                        LineHeight="20"
+                        Text="{Binding LoginEmail}" />
+                    <TextBlock
+                        Height="20"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontWeight="Normal"
+                        Foreground="#1770F4"
+                        LineHeight="20">
+                        <Hyperlink Command="{Binding ChangeEmailCommand}">Change Email</Hyperlink>
                     </TextBlock>
                 </WrapPanel>
-                
-            </Grid>
-           
-            <TextBlock
-                Width="95"
-                Height="22"
-                Margin="32,148,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="14"
-                FontStyle="Normal"
-                Text="Enter password" />
-            <Grid
-            Width="262"
-            Height="32"
-            Margin="32,178,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            IsEnabled="{Binding ElementName=LoginPasswordChk, Path=IsChecked}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="24" />
-                </Grid.ColumnDefinitions>
-                <PasswordBox
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
-                help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Style="{StaticResource LoginPasswordBoxStyle}"
-                Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
-                <TextBox
-                    x:Name="Text_Password"
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
-                Style="{StaticResource LoginPasswordTextBoxStyle}"
-                Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Visibility="{Binding LoginTextVisibility, Mode=TwoWay}" HorizontalAlignment="Left" Width="262" >
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="TextChanged">
-                            <i:InvokeCommandAction Command="{Binding LoginPasswordChangedCommand}" />
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                </TextBox>
-                <CheckBox
-                x:Name="DisplayLoginPasswordChk"
-                Grid.Column="1"
-                Height="16"
-                HorizontalAlignment="Left"
-                Visibility="{Binding ChkVis}"
-                Panel.ZIndex="1"
-                Command="{Binding DisplayPasswordCommand}"
-                CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                IsChecked="{Binding IsLoginPasswordDisplayed, Mode=TwoWay}"
-                Style="{StaticResource EyeCheckbox}" />
-            </Grid>
-            <TextBlock
-                Width="262"
-                Height="20"
-                Margin="32,212,0,0"
-                HorizontalAlignment="Left"
-                Foreground="#F3465B"
-                VerticalAlignment="Top"
-                Text="{Binding LoginPasswordlook, Mode=TwoWay}" />
-
-
-
+                <TextBlock
+                    Height="22"
+                    Margin="0,18,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    FontStyle="Normal"
+                    Text="Enter password" />
+                <Grid
+                    Width="262"
+                    Height="32"
+                    Margin="0,8,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="24" />
+                    </Grid.ColumnDefinitions>
+                    <PasswordBox
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
+                        help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Style="{StaticResource LoginPasswordBoxStyle}"
+                        Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
+                    <TextBox
+                        x:Name="Text_Password"
+                        Grid.ColumnSpan="2"
+                        Width="262"
+                        HorizontalAlignment="Left"
+                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
+                        Style="{StaticResource LoginPasswordTextBoxStyle}"
+                        Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding LoginTextVisibility, Mode=TwoWay}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="TextChanged">
+                                <i:InvokeCommandAction Command="{Binding LoginPasswordChangedCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <CheckBox
+                        x:Name="DisplayLoginPasswordChk"
+                        Grid.Column="1"
+                        Height="16"
+                        HorizontalAlignment="Left"
+                        Panel.ZIndex="1"
+                        Command="{Binding DisplayPasswordCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                     
+                        Style="{StaticResource EyeCheckbox}"
+                        Visibility="{Binding ChkVis}" />
+                </Grid>
+                <TextBlock
+                    Width="262"
+                    Height="20"
+                    Margin="0,2,0,0"
+                    HorizontalAlignment="Center"
+                    Foreground="#F3465B"
+                    Text="{Binding LoginPasswordlook, Mode=TwoWay}" />
 
-            <Button
-                Width="262"
-                Height="32"
-                Margin="32,240,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Command="{Binding LoginCommand}"
-                Content="Login"
-                IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-                Style="{StaticResource Btn.cta}" />
-            
-            <TextBlock
-                Width="122"
-                Height="20"
-                Margin="102,282,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
+                <Button
+                    Width="262"
+                    Height="32"
+                    Margin="0,8,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Command="{Binding LoginCommand}"
+                    Content="Login"
+                    IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
+                    Style="{StaticResource Btn.cta}" />
+                <TextBlock
+                    Height="20"
+                    Margin="0,10,0,0"
+                    HorizontalAlignment="Center"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    FontWeight="Normal"
+                    Foreground="#1770F4"
+                    LineHeight="20">
+                    <Hyperlink Command="{Binding GoCodeUpdataCommand}">Forgot your password?</Hyperlink>
+                </TextBlock>
+            </StackPanel>
+        </Grid>
+        <Grid
+            x:Name="Grid_msg"
+            Width="326"
+            Height="48"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Bottom"
+            Background="#FDC7C6"
+            Visibility="{Binding LoginPasswordlookVis}">
+            <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                <Border    
+                Margin="0,-5,5,0"
+                Width="14"
+                Height="14"
+                Background="#F3465B"
+                CornerRadius="100">
+                    <Path
+                    Margin="-1,-4,0,0"
+                    Data="M7.25 8V13H8.75V8H7.25ZM7.25 14.5V16H8.75L8.75 14.5H7.25Z"
+                    Fill="White" />
+                </Border>
+                <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
                 FontFamily="Segoe UI"
                 FontSize="12"
-                FontWeight="Normal"
-                Foreground="#1770F4"
-                LineHeight="20">
-                <Hyperlink Command="{Binding GoCodeUpdataCommand}">Forgot your password?</Hyperlink>
-            </TextBlock>
-            <Grid
-            Width="326"
-            Height="82"
-            Margin="0,338,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Visibility="{Binding LoginPasswordlookVis}"
-            Background="#FDC7C6" />
-            <TextBlock
-            Height="66"
-            Width="286"
-            Margin="32,346,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            LineHeight="22"
-            Text="{Binding LoginPasswordmsglook}" />
+                FontStyle="Normal"
+                LineHeight="22"
+                Text="{Binding LoginPasswordmsglook}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+            </WrapPanel>
+         
         </Grid>
     </Grid>
 

PDF Office/Views/Dialog/ServiceDialog/LoginRegion.xaml

@@ -275,89 +275,101 @@
     </UserControl.Resources>
     <Grid>
         <Grid Background="White">
-            <TextBlock
-                Width="72"
-                Height="28"
-                Margin="32,48,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="20"
-                FontStyle="Normal"
-                FontWeight="SemiBold"
-                Text="Login" />
-            <TextBlock
-                Width="122"
-                Height="22"
-                Margin="32,108,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="14"
-                FontStyle="Normal"
-                Text="Enter email account" />
+            <Button
+            Width="16"
+            Height="16"
+            Margin="287,17,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+                <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+            </Button>
             <Grid
-                Width="262"
-                Height="32"
-                Margin="32,138,0,0"
-                HorizontalAlignment="Left"
+                Margin="0,48,0,0"
+                HorizontalAlignment="Center"
                 VerticalAlignment="Top">
+                <StackPanel>
+                    <TextBlock
+                        Width="72"
+                        Height="28"
+                        HorizontalAlignment="Left"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontStyle="Normal"
+                        FontWeight="SemiBold"
+                        Text="Login" />
+                    <TextBlock
+                        Width="122"
+                        Height="22"
+                        Margin="0,32,0,0"
+                        HorizontalAlignment="Left"
+                        FontFamily="Segoe UI"
+                        FontSize="14"
+                        FontStyle="Normal"
+                        Text="Enter email account" />
+                    <Grid
+                        Width="262"
+                        Height="32"
+                        Margin="0,8,0,0"
+                        HorizontalAlignment="Left">
+                        <TextBox
+                            x:Name="Text_Email"
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginEmailMsg, Mode=TwoWay}"
+                            Style="{StaticResource LoginEmailTextBoxStyle}"
+                            Text="{Binding LoginEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </Grid>
+                    <TextBlock
+                        Width="262"
+                        Height="20"
+                        Margin="0,2,0,0"
+                        HorizontalAlignment="Left"
+                        Foreground="#F3465B"
+                        Text="{Binding LoginEmaillook, Mode=TwoWay}" />
+                    <Button
+                        Width="262"
+                        Height="32"
+                        Margin="0,48,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Command="{Binding LoginNextCommand}"
+                        Content="Next Step"
+                        IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
+                        Style="{StaticResource Btn.cta}" />
+                    <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <TextBlock
+                            Width="144"
+                            Height="20"
+                            Margin="0,10,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="Normal"
+                            LineHeight="20"
+                            Text="Don't have an account yet?" />
+                        <TextBlock
+                            Width="43"
+                            Height="20"
+                            Margin="0,10,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Top"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="Normal"
+                            Foreground="#1770F4"
+                            LineHeight="20">
+                            <Hyperlink Command="{Binding GoLoginCommand}">Register</Hyperlink>
+                        </TextBlock>
 
-                <TextBox
-                    x:Name="Text_Email"
-                    Grid.ColumnSpan="2"
-                    help:PasswordBoxHelper.DisplayText="{Binding LoginEmailMsg, Mode=TwoWay}"
-                    Style="{StaticResource LoginEmailTextBoxStyle}"
-                    Text="{Binding LoginEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     />
+                    </WrapPanel>
+                </StackPanel>
             </Grid>
-            <TextBlock
-                Width="262"
-                Height="20"
-                Margin="32,172,0,0"
-                Foreground="#F3465B"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Text="{Binding LoginEmaillook, Mode=TwoWay}" />
-
-
 
 
-            <Button
-                Width="262"
-                Height="32"
-                Margin="32,240,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Command="{Binding LoginNextCommand}"
-                Content="Next Step"
-                IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-                Style="{StaticResource Btn.cta}" />
-            <TextBlock
-                Width="144"
-                Height="20"
-                Margin="61.5,282,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="12"
-                FontWeight="Normal"
-                LineHeight="20"
-                Text="Don't have an account yet?" />
-            <TextBlock
-                Width="43"
-                Height="20"
-                Margin="213.5,282,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="12"
-                FontWeight="Normal"
-                Foreground="#1770F4"
-                LineHeight="20">
-                <Hyperlink Command="{Binding GoLoginCommand}">Register</Hyperlink>
-            </TextBlock>
-
         </Grid>
     </Grid>
 

PDF Office/Views/Dialog/ServiceDialog/PasswordUpdataRegion.xaml

@@ -4,9 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Office.Helper"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:PDF_Office.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:prism="http://prismlibrary.com/" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:prism="http://prismlibrary.com/"
     Width="326"
     Height="420"
     prism:ViewModelLocator.AutoWireViewModel="True"
@@ -385,154 +386,168 @@
             </Setter>
         </Style>
     </UserControl.Resources>
-    <Grid>
-        <Grid Background="White">
-            <TextBlock
-                Width="141"
-                Height="28"
-                Margin="32,48,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                FontFamily="Segoe UI"
-                FontSize="20"
-                FontStyle="Normal"
-                FontWeight="SemiBold"
-                Text="Reset password" />
-
-            <Grid
-            Width="262"
-            Height="32"
-            Margin="32,108,0,0"
+    <Grid Background="White">
+        <Button
+            Width="16"
+            Height="16"
+            Margin="287,17,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            IsEnabled="{Binding ElementName=LoginPasswordChk2, Path=IsChecked}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="24" />
-                </Grid.ColumnDefinitions>
-                <PasswordBox
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
-                help:PasswordBoxHelper.Password="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Style="{StaticResource LoginPasswordBoxStyle2}"
-                Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
-                <TextBox
-                 x:Name="Text_RePassword2"
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
-                Style="{StaticResource LoginPasswordTextBoxStyle2}"
-                Text="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Visibility="{Binding LoginTextVisibility2, Mode=TwoWay}" >
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="TextChanged">
-                            <i:InvokeCommandAction Command="{Binding LoginPasswordChanged2Command}" />
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                </TextBox>
-
-                <CheckBox
-                x:Name="DisplayLoginPasswordChk2"
-                Grid.Column="1"
-                Height="16"
-                HorizontalAlignment="Left"
-                Panel.ZIndex="1"
-                     Visibility="{Binding ChkVis2}"
-                Command="{Binding DisplayPasswordCommand2}"
-                CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                IsChecked="{Binding IsLoginPasswordDisplayed2, Mode=TwoWay}"
-                Style="{StaticResource EyeCheckbox}" />
-               
-            </Grid>
-            <TextBlock
-                Width="262"
-                Height="20"
-                Margin="32,142,0,0"
-                Foreground="#F3465B"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Text="{Binding LoginPasswordlook2, Mode=TwoWay}" Grid.ColumnSpan="2" />
-            <Grid
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+            <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+        </Button>
+        <Grid
             Width="262"
-            Height="32"
-            Margin="32,170,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            IsEnabled="{Binding ElementName=LoginPasswordChk, Path=IsChecked}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="24" />
-                </Grid.ColumnDefinitions>
-                <PasswordBox
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
-                help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Style="{StaticResource LoginPasswordBoxStyle}"
-                Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
-                <TextBox
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
-                Style="{StaticResource LoginPasswordTextBoxStyle}"
-                Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Visibility="{Binding LoginTextVisibility, Mode=TwoWay}" >
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="TextChanged">
-                            <i:InvokeCommandAction Command="{Binding LoginPasswordChangedCommand}" />
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                </TextBox>
-                <CheckBox
-                x:Name="DisplayLoginPasswordChk"
-                Grid.Column="1"
-                Height="16"
-                HorizontalAlignment="Left"
-                Panel.ZIndex="1"
-                     Visibility="{Binding ChkVis}"
-                Command="{Binding DisplayPasswordCommand}"
-                CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                IsChecked="{Binding IsLoginPasswordDisplayed, Mode=TwoWay}"
-                Style="{StaticResource EyeCheckbox}" />
-            </Grid>
-            <TextBlock
-                Width="262"
-                Height="20"
-                Margin="32,212,0,0"
-                Foreground="#F3465B"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Text="{Binding LoginPasswordlook, Mode=TwoWay}" />
-
+            Margin="0,48,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top">
+            <StackPanel>
+                <TextBlock
+                    Height="28"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontStyle="Normal"
+                    FontWeight="SemiBold"
+                    Text="Reset password" />
+                <Grid
+                    Width="262"
+                    Height="32"
+                    Margin="0,32,0,0"
+                    VerticalAlignment="Center"
+                    IsEnabled="{Binding ElementName=LoginPasswordChk2, Path=IsChecked}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="24" />
+                    </Grid.ColumnDefinitions>
+                    <PasswordBox
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
+                        help:PasswordBoxHelper.Password="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Style="{StaticResource LoginPasswordBoxStyle2}"
+                        Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
+                    <TextBox
+                        x:Name="Text_RePassword2"
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
+                        Style="{StaticResource LoginPasswordTextBoxStyle2}"
+                        Text="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding LoginTextVisibility2, Mode=TwoWay}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="TextChanged">
+                                <i:InvokeCommandAction Command="{Binding LoginPasswordChanged2Command}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
 
+                    <CheckBox
+                        x:Name="DisplayLoginPasswordChk2"
+                        Grid.Column="1"
+                        Height="16"
+                        HorizontalAlignment="Left"
+                        Panel.ZIndex="1"
+                        Command="{Binding DisplayPasswordCommand2}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                        IsChecked="{Binding IsLoginPasswordDisplayed2, Mode=TwoWay}"
+                        Style="{StaticResource EyeCheckbox}"
+                        Visibility="{Binding ChkVis2}" />
 
-
-            <Button
-                Width="262"
-                Height="32"
-                Margin="32,240,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Command="{Binding PasswordUpdataCommand}"
-                Content="OK"
-                IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-                Style="{StaticResource Btn.cta}" />
-            <Grid
+                </Grid>
+                <TextBlock
+                    Grid.ColumnSpan="2"
+                    Width="262"
+                    Height="20"
+                    Margin="0,2,0,0"
+                    Foreground="#F3465B"
+                    Text="{Binding LoginPasswordlook2, Mode=TwoWay}" />
+                <Grid
+                    Width="262"
+                    Height="32"
+                    Margin="0,8,0,0"
+                    IsEnabled="{Binding ElementName=LoginPasswordChk, Path=IsChecked}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="24" />
+                    </Grid.ColumnDefinitions>
+                    <PasswordBox
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
+                        help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Style="{StaticResource LoginPasswordBoxStyle}"
+                        Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
+                    <TextBox
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
+                        Style="{StaticResource LoginPasswordTextBoxStyle}"
+                        Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding LoginTextVisibility, Mode=TwoWay}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="TextChanged">
+                                <i:InvokeCommandAction Command="{Binding LoginPasswordChangedCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <CheckBox
+                        x:Name="DisplayLoginPasswordChk"
+                        Grid.Column="1"
+                        Height="16"
+                        HorizontalAlignment="Left"
+                        Panel.ZIndex="1"
+                        Command="{Binding DisplayPasswordCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                       
+                        Style="{StaticResource EyeCheckbox}"
+                        Visibility="{Binding ChkVis}" />
+                </Grid>
+                <TextBlock
+                    Width="262"
+                    Height="20"
+                    Margin="0,4,0,0"
+                    Foreground="#F3465B"
+                    Text="{Binding LoginPasswordlook, Mode=TwoWay}" />
+                <Button
+                    Width="262"
+                    Height="32"
+                    Margin="0,16,0,0"
+                    Command="{Binding PasswordUpdataCommand}"
+                    Content="OK"
+                    IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
+                    Style="{StaticResource Btn.cta}" />
+            </StackPanel>
+        </Grid>
+        <Grid
             Width="326"
             Height="82"
-            Margin="0,338,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Visibility="{Binding PasswordUpdatalookVis}"
-            Background="#FDC7C6" />
-            <TextBlock
-            Height="66"
-            Width="286"
-            Margin="32,346,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            LineHeight="22"
-            Text="{Binding PasswordUpdatamsglook}" />
+            VerticalAlignment="Bottom"
+            Background="#FDC7C6"
+            Visibility="{Binding PasswordUpdatalookVis}">
+            <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Border
+                    Margin="-1,-4,0,0"
+                    Width="14"
+                    Height="14"
+                    Background="#F3465B"
+                    CornerRadius="100">
+                    <Path
+                        Margin="-1,-4,0,0"
+                        Data="M7.25 8V13H8.75V8H7.25ZM7.25 14.5V16H8.75L8.75 14.5H7.25Z"
+                        Fill="White" />
+                </Border>
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    FontStyle="Normal"
+                    LineHeight="22"
+                    Text="{Binding PasswordUpdatamsglook}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+            </WrapPanel>
         </Grid>
     </Grid>
 

PDF Office/Views/Dialog/ServiceDialog/RegisterOKRegion.xaml

@@ -7,39 +7,55 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     Width="326"
-    Height="450"
+    Height="420"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <Grid Background="White">
-        <Grid
-            Width="128"
-            Height="128"
-            Margin="99,84,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Background="#D9D9D9" />
-        <TextBlock
-            Width="186"
-            Height="28"
-            Margin="70,228,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontSize="20"
-            FontFamily="Segoe UI"
-            FontWeight="SemiBold"
-            LineHeight="28"
-            Text="Register successfully" />
         <Button
-            x:Name="Btn_RegisterNext"
-            Width="262"
-            Height="32"
-            Margin="32,304,0,0"
+            Width="16"
+            Height="16"
+            Margin="287,17,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            Command="{Binding RegisterGetStartCommand}"
-            Background="#273C62"
-            Content="Getting Started"         
-            Style="{StaticResource Btn.cta}" />
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+            <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+        </Button>
+        <Grid Margin="0,84,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">
+            <StackPanel>
+                <Grid
+                    Width="128"
+                    Height="128"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Background="#D9D9D9" />
+                <TextBlock
+                    Width="186"
+                    Height="28"
+                    Margin="0,16,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontWeight="SemiBold"
+                    LineHeight="28"
+                    Text="Register successfully" />
+                <Button
+                    x:Name="Btn_RegisterNext"
+                    Width="262"
+                    Height="32"
+                    Margin="0,53,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Background="#273C62"
+                    Command="{Binding RegisterGetStartCommand}"
+                    Content="Getting Started"
+                    Style="{StaticResource Btn.cta}" />
+            </StackPanel>
+        </Grid>
+
 
 
     </Grid>

PDF Office/Views/Dialog/ServiceDialog/RegisterRegion.xaml

@@ -4,9 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Office.Helper"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:PDF_Office.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:prism="http://prismlibrary.com/" xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:prism="http://prismlibrary.com/"
     Width="326"
     Height="420"
     prism:ViewModelLocator.AutoWireViewModel="True"
@@ -277,159 +278,164 @@
     <Grid Background="White">
         <Button
             Width="16"
-            Height="16" 
-            WindowChrome.IsHitTestVisibleInChrome="True"
+            Height="16"
             Margin="287,17,0,0"
             HorizontalAlignment="Left"
-            Background="Transparent"  
-            BorderThickness="0"
             VerticalAlignment="Top"
-            Command="{Binding CloseDialogCommand}">
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
             <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
         </Button>
-        <TextBlock
-            Width="72"
-            Height="28"
-            Margin="32,48,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="20"
-            FontStyle="Normal"
-            FontWeight="SemiBold"
-            Text="Sign Up" />
         <Grid
             Width="262"
-            Height="32"
-            Margin="32,108,0,0"
+            Height="316"
+            Margin="32,48,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top">
-            <TextBox
-                Name="Text_Email"
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding RegisterEmailMsg, Mode=TwoWay}"
-                Style="{StaticResource RegisterEmailTextBoxStyle}"
-                Text="{Binding RegisterEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-        </Grid>
-        <TextBlock
-            Width="262"
-            Height="20"
-            Margin="32,144,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Foreground="#F3465B"
-            Text="{Binding RegisterEmaillook, Mode=TwoWay}" />
+            <StackPanel>
+                <TextBlock
+                    Width="72"
+                    Height="28"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontStyle="Normal"
+                    FontWeight="SemiBold"
+                    Text="Sign Up" />
+                <Grid
+                    Margin="0,32,0,0"
+                    Width="262"
+                    Height="32"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top">
+                    <TextBox
+                        Name="Text_Email"
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding RegisterEmailMsg, Mode=TwoWay}"
+                        Style="{StaticResource RegisterEmailTextBoxStyle}"
+                        Text="{Binding RegisterEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>
+                <TextBlock
+                    Width="262"
+                    Height="20"
+                    Margin="0,2,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Foreground="#F3465B"
+                    Text="{Binding RegisterEmaillook, Mode=TwoWay}" />
+
+                <Grid
+                    Width="262"
+                    Height="32"
+                    Margin="0,8,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="24" />
+                    </Grid.ColumnDefinitions>
+                    <PasswordBox
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding RegisterPasswordMsg, Mode=TwoWay}"
+                        help:PasswordBoxHelper.Password="{Binding RegisterPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Style="{StaticResource RegisterPasswordBoxStyle}"
+                        Visibility="{Binding RegisterPasswordVisibility, Mode=TwoWay}" />
+                    <TextBox
+                        Grid.ColumnSpan="2"
+                        help:PasswordBoxHelper.DisplayText="{Binding RegisterPasswordMsg, Mode=TwoWay}"
+                        Style="{StaticResource RegisterPasswordTextBoxStyle}"
+                        Text="{Binding RegisterPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding RegisterTextVisibility, Mode=TwoWay}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="TextChanged">
+                                <i:InvokeCommandAction Command="{Binding RegisterPasswordChangedCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+
+                    <CheckBox
+                        x:Name="DisplayRegisterPasswordChk"
+                        Grid.Column="1"
+                        Height="16"
+                        HorizontalAlignment="Left"
+                        Panel.ZIndex="1"
+                        Command="{Binding DisplayPasswordCommand}"
+                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                        IsChecked="{Binding IsRegisterPasswordDisplayed, Mode=TwoWay}"
+                        Style="{StaticResource EyeCheckbox}"
+                        Visibility="{Binding ChkVis}" />
+                </Grid>
+                <TextBlock
+                    Width="262"
+                    Height="20"
+                    Margin="0,2,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Foreground="#F3465B"
+                    Text="{Binding RegisterePasswordlook, Mode=TwoWay}" />
+                <Button
+                    Width="262"
+                    Height="32"
+                    Margin="0,16,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Command="{Binding RegisterNextCommand}"
+                    Content="{Binding RegisterNextStep}"
+                    IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
+                    Style="{StaticResource Btn.cta}" />
+                <WrapPanel VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,8,0,0">
+                    <TextBlock
+                    Width="136"
+                    Height="20"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    FontWeight="Normal"
+                    LineHeight="20"
+                    Text="{Binding Registertext1}" />
+                    <TextBlock
+                    Width="37"
+                    Height="20"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    FontWeight="Normal"
+                    Foreground="#1770F4"
+                    LineHeight="20">
+                    <Hyperlink Command="{Binding GoLoginCommand}">Sign in</Hyperlink>
+                    </TextBlock>
+                </WrapPanel>
+                <TextBlock
+                    Width="262"
+                    Height="36"
+                    Margin="0,28,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="11"
+                    FontWeight="Normal"
+                    Foreground="#616469"
+                    LineHeight="18"
+                    TextWrapping="Wrap">
+                    <Run Text="By registering, you agree to the" />
+                    <Hyperlink
+                        Command="{Binding LinkPolicyCommand}"
+                        NavigateUri="{Binding UriPolivy}"
+                        TextDecorations="Underline">
+                        privary policy
+                    </Hyperlink>
+                    <Run Text="and" />
+                    <Hyperlink
+                        Command="{Binding LinkLicenseCommand}"
+                        NavigateUri="{Binding UriLicense}"
+                        TextDecorations="Underline">
+                        License Agreement
+                    </Hyperlink>
+                </TextBlock>
+            </StackPanel>
 
-        <Grid
-            Width="262"
-            Height="32"
-            Margin="32,170,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="24" />
-            </Grid.ColumnDefinitions>
-            <PasswordBox
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding RegisterPasswordMsg, Mode=TwoWay}"
-                help:PasswordBoxHelper.Password="{Binding RegisterPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Style="{StaticResource RegisterPasswordBoxStyle}"
-                Visibility="{Binding RegisterPasswordVisibility, Mode=TwoWay}" />
-            <TextBox
-                Grid.ColumnSpan="2"
-                help:PasswordBoxHelper.DisplayText="{Binding RegisterPasswordMsg, Mode=TwoWay}"
-                Style="{StaticResource RegisterPasswordTextBoxStyle}"
-                Text="{Binding RegisterPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Visibility="{Binding RegisterTextVisibility, Mode=TwoWay}" >
-                <i:Interaction.Triggers>
-                    <i:EventTrigger EventName="TextChanged">
-                        <i:InvokeCommandAction Command="{Binding RegisterPasswordChangedCommand}" />
-                    </i:EventTrigger>
-                </i:Interaction.Triggers>
-            </TextBox>
-            
-            <CheckBox
-                x:Name="DisplayRegisterPasswordChk"
-                Grid.Column="1"
-                Height="16"
-                HorizontalAlignment="Left"
-                Panel.ZIndex="1"
-                Command="{Binding DisplayPasswordCommand}"
-                Visibility="{Binding ChkVis}"
-                CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                IsChecked="{Binding IsRegisterPasswordDisplayed, Mode=TwoWay}"
-                Style="{StaticResource EyeCheckbox}" />
         </Grid>
-        <TextBlock
-            Width="262"
-            Height="20"
-            Margin="32,204,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Foreground="#F3465B"
-            Text="{Binding RegisterePasswordlook, Mode=TwoWay}" />
-        <Button
-            Width="262"
-            Height="32"
-            Margin="32,240,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Command="{Binding RegisterNextCommand}"
-            Content="{Binding RegisterNextStep}"
-            IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-            Style="{StaticResource Btn.cta}" />
-        <TextBlock
-            Width="136"
-            Height="20"
-            Margin="72.5,280,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontWeight="Normal"
-            LineHeight="20"
-            Text="{Binding Registertext1}" />
-        <TextBlock
-            Width="37"
-            Height="20"
-            Margin="216.5,280,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontWeight="Normal"
-            Foreground="#1770F4"
-            LineHeight="20">
-            <Hyperlink Command="{Binding GoLoginCommand}">Sign in</Hyperlink>
-        </TextBlock>
-        <TextBlock
-            Width="262"
-            Height="36"
-            Margin="32,328,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="11"
-            FontWeight="Normal"
-            Foreground="#616469"
-            LineHeight="18"
-            TextWrapping="Wrap">
-            <Run Text="By registering, you agree to the" />
-            <Hyperlink
-                Command="{Binding LinkPolicyCommand}"
-                NavigateUri="{Binding UriPolivy}"
-                TextDecorations="Underline">
-                privary policy
-            </Hyperlink>
-            <Run Text="and" />
-            <Hyperlink
-                Command="{Binding LinkLicenseCommand}"
-                NavigateUri="{Binding UriLicense}"
-                TextDecorations="Underline">
-                License Agreement
-            </Hyperlink>
-        </TextBlock>
+
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/ServiceDialog/UserOut.xaml

@@ -0,0 +1,64 @@
+<Window
+    x:Class="PDF_Office.Views.Dialog.ServiceDialog.UserOut"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:PDF_Office.Views.Dialog.ServiceDialog"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="UserOut"
+    Width="392"
+    Height="202"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid>
+            <StackPanel>
+                <WrapPanel Margin="18,18,0,0" HorizontalAlignment="Left">
+                    <Border
+                        Width="20"
+                        Height="20"
+                        Background="#FFAF25"
+                        CornerRadius="100">
+                        <Path
+                            Margin="-2,-2,0,0"
+                            Data="M11 5.33301V13.9997H13V5.33301H11ZM11 15.9997V18.6663H13V15.9997H11Z"
+                            Fill="White" />
+                    </Border>
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="16"
+                        FontWeight="SemiBold"
+                        LineHeight="24"
+                        Text="Unable to log" />
+                </WrapPanel>
+                <TextBlock
+                    Margin="16,16,0,0"
+                    HorizontalAlignment="Left"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    LineHeight="22"
+                    TextWrapping="Wrap">
+                    <Run Text="Your account is currently being logged out and cannot be logged in.                                                                              " />
+                    <Run Text="If you have questions, you can " />
+                    <Hyperlink
+                        Click="Hyperlink_Click"
+                        NavigateUri="https://www.pdfreaderpro.com/zh-cn/contact"
+                        TextDecorations="Underline">
+                        contact customer service
+                    </Hyperlink>
+                </TextBlock>
+                <Button
+                    Width="80"
+                    Height="32"
+                    Margin="296,32,0,0"
+                    HorizontalAlignment="Left"
+                    Background="#1770F4"
+                    Click="Button_Click"
+                    Content="OK"
+                    Foreground="White" />
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Window>

PDF Office/Views/Dialog/ServiceDialog/UserOut.xaml.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace PDF_Office.Views.Dialog.ServiceDialog
+{
+    /// <summary>
+    /// UserOut.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserOut : Window
+    {
+        public UserOut()
+        {
+            InitializeComponent();
+        }
+
+        private void Hyperlink_Click(object sender, RoutedEventArgs e)
+        {
+            Process.Start(new ProcessStartInfo("https://www.pdfreaderpro.com/zh-cn/contact"));
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+    }
+}

PDF Office/Views/Dialog/ServiceDialog/UserOutCodeRegion.xaml

@@ -12,199 +12,219 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <Grid Background="White">
-        <TextBlock
-            Width="138"
-            Height="28"
-            Margin="24,40,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="20"
-            LineHeight="28"
-            FontStyle="Normal"
-            FontWeight="SemiBold"
-            Text="Cancel account" />
-        <TextBlock
-            Width="162"
-            Height="22"
-            Margin="24,108,0,0"
+        <Button
+            Width="16"
+            Height="16"
+            Margin="287,17,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="14"
-            FontStyle="Normal"
-            Text="Enter the verification code" />
+            Background="Transparent"
+            BorderThickness="0"
+            Command="{Binding CloseDialogCommand}"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+            <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+        </Button>
+        <Grid
+            Margin="0,40,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top">
+            <StackPanel>
+                <TextBlock
+                    FontFamily="Segoe UI"
+                    FontSize="20"
+                    FontStyle="Normal"
+                    FontWeight="SemiBold"
+                    LineHeight="28"
+                    Text="Cancel account" />
+                <TextBlock
+                    Margin="0,32,0,0"
+                    HorizontalAlignment="Left"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    FontStyle="Normal"
+                    LineHeight="22"
+                    Text="Enter the verification code" />
+                <WrapPanel Margin="0,8,0,0" HorizontalAlignment="Left">
+                    <TextBox
+                        x:Name="text_Code1"
+                        Width="36"
+                        Height="42"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code1_KeyUp"
+                        Text="{Binding Code1, Mode=TwoWay}"
+                        TextChanged="Code_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code2"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code2_KeyUp"
+                        Text="{Binding Code2, Mode=TwoWay}"
+                        TextChanged="text_Code2_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code3"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code3_KeyUp"
+                        Text="{Binding Code3, Mode=TwoWay}"
+                        TextChanged="text_Code3_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code4"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code4_KeyUp"
+                        Text="{Binding Code4, Mode=TwoWay}"
+                        TextChanged="text_Code4_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code5"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code5_KeyUp"
+                        Text="{Binding Code5, Mode=TwoWay}"
+                        TextChanged="text_Code5_TextChanged" />
+                    <TextBox
+                        x:Name="text_Code6"
+                        Width="36"
+                        Height="42"
+                        Margin="9,0,0,0"
+                        Padding="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        KeyUp="text_Code6_KeyUp"
+                        Text="{Binding Code6, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        TextChanged="text_Code6_TextChanged">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="TextChanged">
+                                <i:InvokeCommandAction Command="{Binding Code6ChangedCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                </WrapPanel>
+                <WrapPanel Margin="0,10,0,0">
+                    <TextBlock
+                        Width="190"
+                        Height="20"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Text="Didn't receive the verification code?" />
+                    <TextBlock
+                        Width="Auto"
+                        Height="20"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Foreground="#1770F4"
+                        LineHeight="20"
+                        Text="{Binding Codetime}" />
+                    <TextBlock
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        FontStyle="Normal"
+                        Foreground="#1770F4"
+                        LineHeight="20"
+                        Visibility="{Binding Codeagin, Mode=TwoWay}">
+                        <Hyperlink Command="{Binding CodetooCommand}">Click to resend</Hyperlink>
+                    </TextBlock>
+                </WrapPanel>
+                <Button
+                    x:Name="Btn_RegisterNext"
+                    Width="200"
+                    Height="32"
+                    Margin="0,34,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Command="{Binding UserOutCommand}"
+                    Content="Cancellation"
+                    IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
+                    Style="{StaticResource Btn.cta}" />
+                <Button
+                    Width="200"
+                    Height="32"
+                    Margin="0,8,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Command="{Binding UserOutCancelCommand}"
+                    Style="{StaticResource btn.ghost}">
+                    <TextBlock Text="Cancel" />
+                </Button>
+            </StackPanel>
+        </Grid>
 
-        <TextBox
-            x:Name="text_Code1"
-            Width="36"
-            Height="42"
-            KeyUp="text_Code1_KeyUp"
-            Margin="24,130,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code1, Mode=TwoWay}"
-            TextChanged="Code_TextChanged" />
-        <TextBox
-            x:Name="text_Code2"
-            Width="36"
-            KeyUp="text_Code2_KeyUp"
-            Height="42"
-            Margin="69,130,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code2, Mode=TwoWay}"
-            TextChanged="text_Code2_TextChanged" />
-        <TextBox
-            x:Name="text_Code3"
-            Width="36"
-            Height="42"
-            Margin="114,130,0,0"
-            Padding="10"
-            KeyUp="text_Code3_KeyUp"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code3, Mode=TwoWay}"
-            TextChanged="text_Code3_TextChanged" />
-        <TextBox
-            x:Name="text_Code4"
-            Width="36"
-            Height="42"
-            KeyUp="text_Code4_KeyUp"
-            Margin="159,130,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code4, Mode=TwoWay}"
-            TextChanged="text_Code4_TextChanged" />
 
-        <TextBox
-            x:Name="text_Code5"
-            Width="36"
-            Height="42"
-            KeyUp="text_Code5_KeyUp"
-            Margin="204,130,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code5, Mode=TwoWay}"
-            TextChanged="text_Code5_TextChanged" />
-        <TextBox
-            x:Name="text_Code6"
-            Width="36"
-            KeyUp="text_Code6_KeyUp"
-            Height="42"
-            Margin="249,130,0,0"
-            Padding="10"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="{Binding Code6, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-            TextChanged="text_Code6_TextChanged">
-            <i:Interaction.Triggers>
-                <i:EventTrigger EventName="Code6Changed">
-                    <i:InvokeCommandAction Command="{Binding Code6ChangedCommand}" />
-                </i:EventTrigger>
-            </i:Interaction.Triggers>
-        </TextBox>
 
-        <TextBlock
-            Width="190"
-            Height="20"
-            Margin="24,182,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Text="Didn't receive the verification code?" />
-        <TextBlock
-            Width="79"
-            Height="20"
-            Margin="226,182,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Foreground="#1770F4"
-            LineHeight="20"
-            Text="{Binding Codetime}" />
-        <TextBlock
-            Width="79"
-            Height="20"
-            Margin="226,182,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            Foreground="#1770F4"
-            LineHeight="20"
-            Visibility="{Binding Codeagin, Mode=TwoWay}">
-            <Hyperlink Command="{Binding CodetooCommand}">Click to resend</Hyperlink>
-        </TextBlock>
-        <Button
-            x:Name="Btn_RegisterNext"
-            Width="200"
-            Height="32"
-            Margin="55,236,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Command="{Binding UserOutCommand}"
-            Content="Cancellation"
-            IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-            Style="{StaticResource Btn.cta}" />
 
-        <Button
-                Width="200"
-                Height="32"
-                Margin="55,276,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Command="{Binding UserOutCancelCommand}"
-                Style="{StaticResource btn.ghost}">
-            <TextBlock Text="Cancel" />
-        </Button>
 
         <Grid
+            x:Name="Grid_UserCodemsgVis"
             Width="310"
             Height="48"
-            Margin="0,320,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Visibility="{Binding UserCodemsgVis}"
-            Background="#FDC7C6" />
-        <TextBlock
-            Height="22"
-            Width="185"
-            Margin="32,333,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="Segoe UI"
-            FontSize="12"
-            FontStyle="Normal"
-            LineHeight="22"
-            Text="{Binding UserCodemsg}" />
-
+            HorizontalAlignment="Center"
+            VerticalAlignment="Bottom"
+            Background="#FDC7C6"
+            Visibility="{Binding UserCodemsgVis, Mode=TwoWay}">
+            <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Border
+                    Margin="-1,-4,0,0"
+                    Width="14"
+                    Height="14"
+                    Background="#F3465B"
+                    CornerRadius="100">
+                    <Path
+                        Margin="-1,-4,0,0"
+                        Data="M7.25 8V13H8.75V8H7.25ZM7.25 14.5V16H8.75L8.75 14.5H7.25Z"
+                        Fill="White" />
+                </Border>
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    FontStyle="Normal"
+                    LineHeight="22"
+                    Text="{Binding UserCodemsg, Mode=TwoWay}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+            </WrapPanel>
+        </Grid>
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/ServiceDialog/UserOutCodeRegion.xaml.cs

@@ -22,6 +22,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
     /// </summary>
     public partial class UserOutCodeRegion : UserControl
     {
+        
         public UserOutCodeRegion()
         {
             InitializeComponent();
@@ -38,6 +39,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void Code_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_UserCodemsgVis.Visibility = Visibility.Collapsed;
             if (text_Code1.Text.Length == 1)
             {
                 text_Code2.Focus();
@@ -62,6 +64,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code2_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_UserCodemsgVis.Visibility = Visibility.Collapsed;
             if (text_Code2.Text.Length == 1)
             {
                 text_Code3.Focus();
@@ -83,6 +86,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code3_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_UserCodemsgVis.Visibility = Visibility.Collapsed;
             if (text_Code3.Text.Length == 1)
             {
                 text_Code4.Focus();
@@ -104,6 +108,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code4_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_UserCodemsgVis.Visibility = Visibility.Collapsed;
             if (this.text_Code4.Text.Length == 1)
             {
                 this.text_Code5.Focus();
@@ -125,6 +130,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code5_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_UserCodemsgVis.Visibility = Visibility.Collapsed;
             if (this.text_Code5.Text.Length == 1)
             {
                 this.text_Code6.Focus();
@@ -146,6 +152,7 @@ namespace PDF_Office.Views.Dialog.ServiceDialog
 
         private void text_Code6_TextChanged(object sender, TextChangedEventArgs e)
         {
+            Grid_UserCodemsgVis.Visibility = Visibility.Collapsed;
             if (this.text_Code6.Text.Length == 1)
             {
                 text_Code6.Focus();

PDF Office/Views/HomePanel/RecentFiles/RecentFilesContent.xaml

@@ -15,6 +15,7 @@
     d:DesignWidth="800"
     prism:ViewModelLocator.AutoWireViewModel="True"
     Loaded="UserControl_Loaded"
+    KeyDown="UserControl_KeyDown"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>

PDF Office/Views/HomePanel/RecentFiles/RecentFilesContent.xaml.cs

@@ -210,5 +210,18 @@ namespace PDF_Office.Views.HomePanel.RecentFiles
         }
 
         #endregion
+
+        private void UserControl_KeyDown(object sender, KeyEventArgs e)
+        {
+            //点击ESC取消选中
+            if(GridRecentFilesList.Visibility == Visibility.Visible)
+            {
+                GridRecentFilesList.SelectedIndex = -1;
+            }
+            else
+            {
+                RecentFilesList.SelectedIndex = -1;
+            }
+        }
     }
 }

PDF Office/Views/MainWindow.xaml

@@ -233,6 +233,18 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal"
             WindowChrome.IsHitTestVisibleInChrome="True">
+            <Grid Visibility="{Binding ElementName=Btn_Login,Path=Visibility}" >
+                <Border VerticalAlignment="Center">
+                    <Path Data="M0 4C0 1.79086 1.79086 0 4 0H132C134.209 0 136 1.79086 136 4V10.323C136 10.7319 136.249 11.0996 136.629 11.2514L141.179 13.0715C142.017 13.4068 142.017 14.5932 141.179 14.9285L136.629 16.7486C136.249 16.9004 136 17.2681 136 17.677V24C136 26.2091 134.209 28 132 28H4C1.79086 28 0 26.2091 0 24V4Z" Fill="#FFCF52" />
+                </Border>
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="12"
+                    LineHeight="19.6"
+                    Text="登录解锁高级功能" />
+            </Grid>
+
             <Button
                 x:Name="Btn_Register"
                 Width="40"
@@ -242,16 +254,16 @@
                 Style="{StaticResource subToolBar}"
                 Visibility="{Binding RegisterVis, Mode=TwoWay}">
                 <Border
-                    Width="28"
-                    Height="28"
+                    Width="40"
+                    Height="40"
+                    Margin="-2,-2,0,0"
                     Background="{StaticResource color.icon.base.neutral.norm.lv1}"
                     BorderBrush="{StaticResource color.icon.base.neutral.norm.lv1}"
                     BorderThickness="1"
                     CornerRadius="100">
                     <Path
-                        Width="20"
-                        Height="20"
-                        Margin="-3,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
                         Data="M12 13C14.2091 13 16 11.2091 16 9C16 6.79086 14.2091 5 12 5C9.79086 5 8 6.79086 8 9C8 11.2091 9.79086 13 12 13ZM12 31C17.5228 31 22 27.4183 22 23C22 18.5817 17.5228 15 12 15C6.47715 15 2 18.5817 2 23C2 27.4183 6.47715 31 12 31Z"
                         Fill="White" />
                 </Border>
@@ -265,16 +277,18 @@
                 Style="{StaticResource subToolBar}"
                 Visibility="{Binding LoginVis, Mode=TwoWay}">
                 <Border
-                    Width="28"
-                    Height="28"
+                    Width="40"
+                    Height="40"
+                    Margin="-2,-2,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     Background="{StaticResource color.icon.base.neutral.norm.lv1}"
                     BorderBrush="{StaticResource color.icon.base.neutral.norm.lv1}"
                     BorderThickness="1"
                     CornerRadius="100">
                     <Path
-                        Width="20"
-                        Height="20"
-                        Margin="-3,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
                         Data="M12 13C14.2091 13 16 11.2091 16 9C16 6.79086 14.2091 5 12 5C9.79086 5 8 6.79086 8 9C8 11.2091 9.79086 13 12 13ZM12 31C17.5228 31 22 27.4183 22 23C22 18.5817 17.5228 15 12 15C6.47715 15 2 18.5817 2 23C2 27.4183 6.47715 31 12 31Z"
                         Fill="White" />
                 </Border>
@@ -288,16 +302,16 @@
                 Style="{StaticResource subToolBar}"
                 Visibility="{Binding UserVis, Mode=TwoWay}">
                 <Border
-                    Width="28"
-                    Height="28"
+                    Width="40"
+                    Height="40"
+                    Margin="-2,-2,0,0"
                     Background="#1770F4"
                     BorderBrush="{StaticResource color.icon.base.neutral.norm.lv1}"
                     BorderThickness="1"
                     CornerRadius="100">
                     <Path
-                        Width="20"
-                        Height="20"
-                        Margin="-3,0,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
                         Data="M12 13C14.2091 13 16 11.2091 16 9C16 6.79086 14.2091 5 12 5C9.79086 5 8 6.79086 8 9C8 11.2091 9.79086 13 12 13ZM12 31C17.5228 31 22 27.4183 22 23C22 18.5817 17.5228 15 12 15C6.47715 15 2 18.5817 2 23C2 27.4183 6.47715 31 12 31Z"
                         Fill="White" />
                 </Border>