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

PDF Office/App.xaml.cs

@@ -68,6 +68,7 @@ using Microsoft.AppCenter.Crashes;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
+using Prism.Services.Dialogs;
 
 namespace PDF_Master
 {
@@ -549,6 +550,8 @@ namespace PDF_Master
             containerRegistry.RegisterDialog<NoviceGuidDialog>(DialogNames.GuidDialog);
             containerRegistry.RegisterDialog<IAPCompareDialog>(DialogNames.IAPCompareDialog);
 
+            containerRegistry.Register<IDialogWindow, CustomControl.DialogWindow>();
+
             #endregion 注册弹窗
         }
 

PDF Office/CustomControl/DialogWindow.cs

@@ -0,0 +1,27 @@
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace PDF_Master.CustomControl
+{
+    /// <summary>
+    /// 为解决 拖拽打开加密文档时，解密弹窗偶现不属于主窗体的问题，重写Prism dialog
+    /// </summary>
+    public class DialogWindow : Window, IDialogWindow
+    {
+        public IDialogResult Result { get; set; }
+
+        public DialogWindow()
+        {
+            if(Owner==null)
+            {
+                Owner = Application.Current.MainWindow;
+            }
+        }
+
+    }
+}

PDF Office/DataConvert/LoginBordVis.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace PDF_Master.DataConvert
+{
+    public class LoginBordVis : IValueConverter
+    {
+        //用于轻会员输入错误变红显示
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if ((string)value == "")
+                return Visibility.Collapsed;
+            else return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+
+    }
+}
+    

PDF Office/EventAggregators/PageEditNotifyEvent.cs

@@ -25,6 +25,12 @@ namespace PDF_Master.EventAggregators
             Type = NotifyType.RefreshPage;
         }
 
+        public PageEditNotifyEventArgs(string unicode, NotifyType type)
+        {
+            Unicode = unicode;
+            Type = type;
+        }
+
         public PageEditNotifyEventArgs(string unicode,NotifyType type,List<int> pages)
         {
             Unicode = unicode;

PDF Office/Helper/ServiceHelper.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Management;
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -65,7 +66,19 @@ namespace PDF_Master.Helper
         public static string GetUserUrl = "/pdf-office-sso/user/me";
 
 
-       
+
+        /// <summary>
+        /// 用于检查网络是否可以连接互联网,true表示连接成功,false表示连接失败 
+        /// </summary>
+        /// <returns></returns>
+        [DllImport("wininet.dll")]
+        private extern static bool InternetGetConnectedState(int Description, int ReservedValue);
+
+        public static bool IsConnectInternet()
+        {
+            int Description = 0;
+            return InternetGetConnectedState(Description, 0);
+        }
 
 
 
@@ -258,7 +271,7 @@ namespace PDF_Master.Helper
                     {
                         request.Abort();
                     }
-
+                    Console.WriteLine(responseData);
                     JToken jToken;
                     if(jobject.TryGetValue("msg" ,out jToken)==false)
                     {
@@ -268,13 +281,16 @@ namespace PDF_Master.Helper
                     }
                    else
                     {
+                      
                         return "false";
                     }
                 }
            }
             catch
             {
-                return "300";
+                if (Settings.Default.AppProperties.LoginToken == "")
+                    return "No Token";
+                else  return "300";
             }
            
                

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -278,6 +278,18 @@
           <source>Time transfer error</source>
           <target state="new">Time transfer error</target>
         </trans-unit>
+        <trans-unit id="Text_cancel" translate="yes" xml:space="preserve">
+          <source>Cancel</source>
+          <target state="new">Cancel</target>
+        </trans-unit>
+        <trans-unit id="Text_Cancellatio" translate="yes" xml:space="preserve">
+          <source>Cancellation</source>
+          <target state="new">Cancellation</target>
+        </trans-unit>
+        <trans-unit id="Text_userout" translate="yes" xml:space="preserve">
+          <source>Cancel account</source>
+          <target state="new">Cancel account</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -278,6 +278,18 @@
           <source>Time transfer error</source>
           <target state="new">Time transfer error</target>
         </trans-unit>
+        <trans-unit id="Text_cancel" translate="yes" xml:space="preserve">
+          <source>Cancel</source>
+          <target state="new">Cancel</target>
+        </trans-unit>
+        <trans-unit id="Text_Cancellatio" translate="yes" xml:space="preserve">
+          <source>Cancellation</source>
+          <target state="new">Cancellation</target>
+        </trans-unit>
+        <trans-unit id="Text_userout" translate="yes" xml:space="preserve">
+          <source>Cancel account</source>
+          <target state="new">Cancel account</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -278,6 +278,18 @@
           <source>Time transfer error</source>
           <target state="new">Time transfer error</target>
         </trans-unit>
+        <trans-unit id="Text_cancel" translate="yes" xml:space="preserve">
+          <source>Cancel</source>
+          <target state="new">Cancel</target>
+        </trans-unit>
+        <trans-unit id="Text_Cancellatio" translate="yes" xml:space="preserve">
+          <source>Cancellation</source>
+          <target state="new">Cancellation</target>
+        </trans-unit>
+        <trans-unit id="Text_userout" translate="yes" xml:space="preserve">
+          <source>Cancel account</source>
+          <target state="new">Cancel account</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/PDF Master.csproj

@@ -299,6 +299,7 @@
     <Compile Include="CustomControl\CustomIconToggleBtn.cs" />
     <Compile Include="CustomControl\CustomImageControl.cs" />
     <Compile Include="CustomControl\DialogContent.cs" />
+    <Compile Include="CustomControl\DialogWindow.cs" />
     <Compile Include="CustomControl\Form\FormFieldCombox.xaml.cs">
       <DependentUpon>FormFieldCombox.xaml</DependentUpon>
     </Compile>
@@ -355,6 +356,7 @@
     <Compile Include="DataConvert\IntToColorBrush.cs" />
     <Compile Include="DataConvert\InvertBoolConvert.cs" />
     <Compile Include="DataConvert\ListCountToVisible.cs.cs" />
+    <Compile Include="DataConvert\LoginBordVis.cs" />
     <Compile Include="DataConvert\ObjectConvert.cs" />
     <Compile Include="DataConvert\PropertyPanelVisible.cs" />
     <Compile Include="DataConvert\SignatureButtonConvert.cs" />

PDF Office/Strings/Service/Service.Designer.cs

@@ -420,6 +420,24 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Cancel 的本地化字符串。
+        /// </summary>
+        public static string Text_cancel {
+            get {
+                return ResourceManager.GetString("Text_cancel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Cancellation 的本地化字符串。
+        /// </summary>
+        public static string Text_Cancellatio {
+            get {
+                return ResourceManager.GetString("Text_Cancellatio", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Change Email 的本地化字符串。
         /// </summary>
@@ -609,6 +627,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Cancel account 的本地化字符串。
+        /// </summary>
+        public static string Text_userout {
+            get {
+                return ResourceManager.GetString("Text_userout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Unable to Log In 的本地化字符串。
         /// </summary>

PDF Office/Strings/Service/Service.resx

@@ -237,6 +237,12 @@
   <data name="Text_back" xml:space="preserve">
     <value>Back to previous step</value>
   </data>
+  <data name="Text_cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Text_Cancellatio" xml:space="preserve">
+    <value>Cancellation</value>
+  </data>
   <data name="Text_chmail" xml:space="preserve">
     <value>Change Email</value>
   </data>
@@ -300,6 +306,9 @@
   <data name="Text_useracc" xml:space="preserve">
     <value>Account Information</value>
   </data>
+  <data name="Text_userout" xml:space="preserve">
+    <value>Cancel account</value>
+  </data>
   <data name="Text_useroutinglogin" xml:space="preserve">
     <value>Unable to Log In</value>
   </data>

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -243,6 +243,7 @@ namespace PDF_Master.ViewModels.BOTA
             region = regionManager;
             dialogs = dialogService;
             events = eventAggregator;
+            Unicode = App.mainWindowViewModel.SelectedItem.Unicode;
             LoadedCommand = new DelegateCommand<object>(Loaded);
             ListBoxItemPreviewMouseLeftButtonDown = new DelegateCommand<object>(ListBoxItem_PreviewMouseLeftButtonDown);
             AddNotesCommand = new DelegateCommand<object>(AddNotesEvent);
@@ -255,6 +256,15 @@ namespace PDF_Master.ViewModels.BOTA
             TimeAscendingCommand = new DelegateCommand(TimeAscendingEvent);
             TimeDescendingCommand = new DelegateCommand(TimeDescendingEvent);
             InitString();
+
+
+            events.GetEvent<RefreshAnnotEvent>().Subscribe(RefreshData, e => e.Unicode == Unicode);
+            events.GetEvent<PageEditNotifyEvent>().Subscribe(OnNotifyEvent,e=>e.Unicode == Unicode&&e.Type== NotifyType.PageCountChanged);
+        }
+
+        private void OnNotifyEvent(PageEditNotifyEventArgs obj)
+        {
+            RefreshAnnotationListItems();
         }
 
         public void HiddenAnnot()
@@ -894,17 +904,17 @@ namespace PDF_Master.ViewModels.BOTA
                         DialogParameters value = new DialogParameters();
                         value.Add(ParameterNames.Annotation, args);
                         dialogs.ShowDialog(DialogNames.AddAnnotationDialog, value, e =>
-                                                                                                                                                                                          {
-                                                                                                                                                                                              if (e.Result == ButtonResult.OK && e.Parameters != null)
-                                                                                                                                                                                              {
-                                                                                                                                                                                                  PdfViewer.UndoManager.CanSave = true;
-                                                                                                                                                                                                  if (e.Parameters.ContainsKey(ParameterNames.Annotation) && e.Parameters.ContainsKey(ParameterNames.AnnotEvent))
-                                                                                                                                                                                                  {
-                                                                                                                                                                                                      AnnotationHandlerEventArgs annotation = e.Parameters.GetValue<AnnotationHandlerEventArgs>(ParameterNames.Annotation);
-                                                                                                                                                                                                      RefreshOneListItem(annotation.AnnotHandlerEventArgs);
-                                                                                                                                                                                                  }
-                                                                                                                                                                                              }
-                                                                                                                                                                                          });
+                        {
+                            if (e.Result == ButtonResult.OK && e.Parameters != null)
+                            {
+                                PdfViewer.UndoManager.CanSave = true;
+                                if (e.Parameters.ContainsKey(ParameterNames.Annotation) && e.Parameters.ContainsKey(ParameterNames.AnnotEvent))
+                                {
+                                    AnnotationHandlerEventArgs annotation = e.Parameters.GetValue<AnnotationHandlerEventArgs>(ParameterNames.Annotation);
+                                    RefreshOneListItem(annotation.AnnotHandlerEventArgs);
+                                }
+                            }
+                        });
                     }
                     //else if (args.EventType == AnnotArgsType.AnnotFreeText)
                     //{
@@ -1184,8 +1194,6 @@ namespace PDF_Master.ViewModels.BOTA
             //RefreshAnnotationListItems();
             KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
             KeyEventsHelper.KeyDown += ShortCut_KeyDown;
-            Unicode = App.mainWindowViewModel.SelectedItem.Unicode;
-            events.GetEvent<RefreshAnnotEvent>().Subscribe(RefreshData, e => e.Unicode == Unicode);
         }
 
         private void RefreshData(RefreshAnnotArgs obj)

PDF Office/ViewModels/BOTA/BookmarkContentViewModel.cs

@@ -83,6 +83,7 @@ namespace PDF_Master.ViewModels.BOTA
         private IDialogService dialogs;
         public CPDFViewer PDFViewer;
         public IEventAggregator events;
+        private string unicode;
 
         /// <summary>
         /// 书签ItemSouce
@@ -145,6 +146,7 @@ namespace PDF_Master.ViewModels.BOTA
             region = regionManager;
             dialogs = dialogService;
             events = eventAggregator;
+            unicode = App.mainWindowViewModel.SelectedItem.Unicode;
             Bookmarklist = new ObservableCollection<CPDFBookmark>();
 
             LostFocusCommand = new DelegateCommand<object>(LostFocusEvent);
@@ -156,6 +158,18 @@ namespace PDF_Master.ViewModels.BOTA
             EditPageIndexCommand = new DelegateCommand<object>(EditPageIndexEvent);
             KeyDownCommand = new DelegateCommand<object>(KeyDownEvent);
             InitString();
+
+            events.GetEvent<PageEditNotifyEvent>().Subscribe(OnNotifyEvent,e=>e.Unicode==unicode&&e.Type== NotifyType.PageCountChanged);
+        }
+
+        /// <summary>
+        /// 页面编辑页数发生变化后触发的事件
+        /// 更新BOTA数据源
+        /// </summary>
+        /// <param name="obj"></param>
+        private void OnNotifyEvent(PageEditNotifyEventArgs obj)
+        {
+            InitBookMarkSource();
         }
 
         /// <summary>
@@ -456,6 +470,20 @@ namespace PDF_Master.ViewModels.BOTA
             return isExistBookmark;
         }
 
+        /// <summary>
+        /// 刷新书签列表数据源
+        /// </summary>
+        private void InitBookMarkSource()
+        {
+            if (PDFViewer.Document.GetBookmarkList().Count > 0)
+            {
+                Bookmarklist = new ObservableCollection<CPDFBookmark>(PDFViewer.Document.GetBookmarkList().OrderBy(d => d.PageIndex));
+            }
+            //避免重复绑定
+            bookmarklist.CollectionChanged -= Bookmarklist_CollectionChanged;
+            Bookmarklist.CollectionChanged += Bookmarklist_CollectionChanged;
+        }
+
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
             KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
@@ -467,11 +495,7 @@ namespace PDF_Master.ViewModels.BOTA
                 IsEmptyPanelVisibility = Visibility.Visible;
                 return;
             }
-            if (PDFViewer.Document.GetBookmarkList().Count > 0)
-            {
-                Bookmarklist = new ObservableCollection<CPDFBookmark>(PDFViewer.Document.GetBookmarkList().OrderBy(d => d.PageIndex));
-            }
-            Bookmarklist.CollectionChanged += Bookmarklist_CollectionChanged;
+            InitBookMarkSource();
             if (Bookmarklist.Count < 1)
             {
                 IsEmptyPanelVisibility = Visibility.Visible;

PDF Office/ViewModels/BOTA/OutLineControlViewModel.cs

@@ -3,9 +3,11 @@ using ComPDFKit.PDFDocument.Action;
 using ComPDFKit.PDFPage;
 using ComPDFKitViewer.PdfViewer;
 using PDF_Master.CustomControl;
+using PDF_Master.EventAggregators;
 using PDF_Master.Model;
 using PDF_Master.Model.BOTA;
 using Prism.Commands;
+using Prism.Events;
 using Prism.Mvvm;
 using Prism.Regions;
 using System;
@@ -87,6 +89,10 @@ namespace PDF_Master.ViewModels.BOTA
 
         private CPDFViewer PDFViewer;
 
+        private IEventAggregator events;
+
+        private string unicode;
+
         public ObservableCollection<OutlineNode> Outlinelist { get; set; }
 
         private bool isInsertHead = false;
@@ -115,15 +121,20 @@ namespace PDF_Master.ViewModels.BOTA
         public DelegateCommand DeleteAllCommand { get; set; }
         public DelegateCommand<OutlineNode> DowngradeCommand { get; set; }
 
-        public OutLineControlViewModel()
+        public OutLineControlViewModel(IEventAggregator eventAggregator)
         {
+            events = eventAggregator;
+            unicode = App.mainWindowViewModel.SelectedItem.Unicode;
             Outlinelist = new ObservableCollection<OutlineNode>();
             DeleteAllCommand = new DelegateCommand(DeleteAll);
             CollapseAllCommand = new DelegateCommand<ObservableCollection<OutlineNode>>(CollapseAll);
             ExpandAllCommand = new DelegateCommand<ObservableCollection<OutlineNode>>(ExpandAll);
             InitString();
+
+            events.GetEvent<PageEditNotifyEvent>().Subscribe(OneNotifyEvent, e =>e.Unicode == unicode&&e.Type == NotifyType.PageCountChanged);
         }
 
+
         public bool IsNavigationTarget(NavigationContext navigationContext)
         {
             return true;
@@ -160,6 +171,16 @@ namespace PDF_Master.ViewModels.BOTA
             PDFViewer.GetCreateOutLineInfo();
         }
 
+        /// <summary>
+        /// 缩略图或页面编辑的页面数量变化时 刷新大纲列表
+        /// </summary>
+        /// <param name="obj"></param>
+        private void OneNotifyEvent(PageEditNotifyEventArgs obj)
+        {
+            Updata(false);
+        }
+
+
         /// <summary>
         /// 更新大纲数据，并保存状态设置为true
         /// </summary>

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

@@ -83,11 +83,12 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         #endregion
 
-        private bool _EnableNextStep = true;
+        private bool _EnableNextStep = false;
         public bool EnableNextStep
         {
             get { return _EnableNextStep; }
-            set { SetProperty(ref _EnableNextStep, value); }
+            set { SetProperty(ref _EnableNextStep, value);
+            }
         }
 
         private string _CodeTypeName = "";
@@ -104,7 +105,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             set { SetProperty(ref _CodeType, value); }
         }
 
-        private string _codetime = "60";
+        private string _codetime = "(60)";
         public string Codetime
         {
             get { return _codetime; }
@@ -325,66 +326,33 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void RegisterNext()
         {
            
-
-            Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
-                if (Codesum.Length == 6)
-               {
                 if (CodeType == "user_register")
                 {
                     
-                    if (ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType) == "200")
-                    {
-                        
-                        if (ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid) == "200")
-                        {
+                   
                             App.mainWindowViewModel.UserVis = Visibility.Visible;
                             App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                             App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
                             App.mainWindowViewModel.OphVis = Visibility.Collapsed;
                             Settings.Default.UserDate.Email = RegisterDialogViewModel.RegisterEmail;
                             RegisterDialogViewModel.RegionMan("RegisterOKRegion");
-                        }
-                        else
-                        {
-                            RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid));
-                            RegisterCodemsgVis = Visibility.Visible;
-                        }
-                    }
-                    else
-                    {
-                        RegisterCodemsg = ErrorCodeHelper.Ercode(ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType)));
-                        RegisterCodemsgVis = Visibility.Visible;
-                    }
+                       
                 }
                 else
                 {
-                    
-                    if (ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType) == "200")
-                    {
+                                     
                         LoginDialogViewModel.PasswordCode = Codesum;
                         LoginDialogViewModel.RegionMan("PasswordUpdataRegion");
-                    }
-                    else
-                    {
-                        RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType));
-                        RegisterCodemsgVis = Visibility.Visible;
-                    }
-                }
-
-                }
-                else
-            {
-                RegisterCodemsg = "Please enter a six digit verification code";
-            }
+                   
+                }         
             
         }
 
         //第六个密码框改变
         private void Code6Changed()
         {
-           if(Code6.Length==1)
-            {
-               ;
+          
+                Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
                 if (CodeSum() ==true)
                 {
                     if (CodeType == "user_register")
@@ -395,21 +363,19 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                             
                             if (ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid) == "200")
                             {
-                                App.mainWindowViewModel.UserVis = Visibility.Visible;
-                                App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
-                                App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
-                                App.mainWindowViewModel.OphVis = Visibility.Collapsed;
-                                Settings.Default.UserDate.Email = RegisterDialogViewModel.RegisterEmail;
-                                RegisterDialogViewModel.RegionMan("RegisterOKRegion");
+                                EnableNextStep = true;
                             }
                             else
                             {
+                                EnableNextStep = false;
                                 RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid));
                                 RegisterCodemsgVis = Visibility.Visible;
                             }
                         }
                         else
                         {
+                            EnableNextStep = false;
+                            string str1 = ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType);
                             RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType));
                             RegisterCodemsgVis = Visibility.Visible;
                         }
@@ -419,23 +385,23 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                         
                         if (ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType) == "200")
                         {
-                            LoginDialogViewModel.PasswordCode = Codesum;
-                            LoginDialogViewModel.RegionMan("PasswordUpdataRegion");
+                            EnableNextStep = true;
                         }
                         else
                         {
+                            EnableNextStep = false;
                             RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType));
                             RegisterCodemsgVis = Visibility.Visible;
                         }
                     }
 
-                }
-                else
-                {
-                    RegisterCodemsg = "Please enter a six digit verification code";
-                    RegisterCodemsgVis = Visibility.Visible;
-                }
+                
+               
 
+            }
+            else
+            {
+                EnableNextStep = false;
             }
         }
 
@@ -462,12 +428,12 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             if (time == 0)
             {
                 Codeagin = Visibility.Visible;
-                Codetime = "";
+                Codetime = " ";
             }
             else
             {
                 time--;
-                Codetime = "("+time.ToString()+")";
+                Codetime = " ("+time.ToString()+")";
             }
         }
 

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

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using PDF_Master.Helper;
+using PDF_Master.Properties;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -65,9 +68,14 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public void OnDialogOpened(IDialogParameters parameters)
         {
-            RegionMan("LoginRegion");
+            if (ServiceHelper.IsConnectInternet() == false)
+            {
+                RegionMan("NOInternetRegion");
+            }
+            else { RegionMan("LoginRegion"); }
         }
 
+
         LoginDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             this.Region = regionManager;

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

@@ -47,14 +47,14 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         #region 文案
 
-        private string _Text_login = "";
+        private string _Text_Login = "";
 
-        public string Text_login
+        public string Text_Login
         {
-            get { return _Text_login; }
+            get { return _Text_Login; }
             set
             {
-                SetProperty(ref _Text_login, value);
+                SetProperty(ref _Text_Login, value);
             }
         }
 
@@ -103,10 +103,32 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private void InitString()
+
+        private string _Codemax = "";
+        public string Codemax
+        {
+            get { return _Codemax; }
+            set
+            {
+                SetProperty(ref _Codemax, value);
+            }
+        }
+
+        private string _Codemin = "";
+        public string Codemin
         {
+            get { return _Codemin; }
+            set
+            {
+                SetProperty(ref _Codemin, value);
+            }
+        }
 
-            Text_login = App.ServiceLoader.GetString("Text_login");
+        private void InitString()
+        {
+            Codemax = App.ServiceLoader.GetString("Codemax");
+            Codemin = App.ServiceLoader.GetString("Codemin");
+            Text_Login = App.ServiceLoader.GetString("Text_Login");
             Text_chmail = App.ServiceLoader.GetString("Text_chmail");
             Text_enterpass = App.ServiceLoader.GetString("RegisterPasswordMsg");
             Text_forgetpass = App.ServiceLoader.GetString("Text_forgetpass");
@@ -245,13 +267,13 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void LoginPasswordChanged()
         {
 
-            if (LoginPassword.Length < 6)
+            if (LoginPassword.Length < 6 && LoginPassword.Length > 0)
             {
-                LoginPasswordlook = "At least 6 characters";
+                LoginPasswordlook = Codemin;
             }
             else if (LoginPassword.Length > 24)
             {
-                LoginPasswordlook = "Up to 24 characters";
+                LoginPasswordlook = Codemax;
             }
             else
             {
@@ -278,7 +300,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             
             
-            if (ServiceHelper.Login(LoginEmail, LoginPassword, uuid) == "success")
+            if (ServiceHelper.Login(LoginEmail, LoginPassword, uuid) == "200")
             {
                 LoginDialogViewModel.Close();
                 App.mainWindowViewModel.UserVis = Visibility.Visible;

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

@@ -185,7 +185,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         LoginRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             dialogs = dialogService;
-          
+
             LoginNextCommand = new DelegateCommand(LoginNext);
             GoLoginCommand = new DelegateCommand(GoLogin);
             InitString();
@@ -201,10 +201,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 LoginDialogViewModel.LoginEmail = LoginEmail;
                 LoginDialogViewModel.RegionMan("LoginPasswordRegion");
             }
-            else if (ServiceHelper.Ok_email(LoginEmail, "1") == "300")
-            {
-                LoginDialogViewModel.RegionMan("NOInternetRegion");
-            }
+           
             else if (ServiceHelper.Ok_email(LoginEmail, "1") == "318")
             {
                 
@@ -253,6 +250,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             {
                 EnableNextStep = false;
             }
+
+            
         }
 
 

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

@@ -19,6 +19,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
     public class NOInternetRegionViewModel : BindableBase, INavigationAware
     {
         private LoginDialogViewModel LoginDialogViewModel;
+        private RegisterDialogViewModel RegisterDialogViewModel;
+        private UserDialogViewModel UserDialogViewModel;
         public IDialogService dialogs;
 
         public bool IsNavigationTarget(NavigationContext navigationContext)
@@ -35,6 +37,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
             navigationContext.Parameters.TryGetValue<LoginDialogViewModel>("LoginDialogViewModel", out LoginDialogViewModel);
+            navigationContext.Parameters.TryGetValue<RegisterDialogViewModel>("RegisterDialogViewModel", out RegisterDialogViewModel);
+            navigationContext.Parameters.TryGetValue<UserDialogViewModel>("UserDialogViewModel", out UserDialogViewModel);
+
         }
 
 
@@ -97,7 +102,24 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         }
         private void Retry()
         {
-            LoginDialogViewModel.RegionMan("LoginRegion");
+            if (ServiceHelper.IsConnectInternet()==true)
+            {
+
+                if (RegisterDialogViewModel != null)
+                {
+                    RegisterDialogViewModel.RegionMan("RegisterRegion");
+                }
+                else if (LoginDialogViewModel != null)
+                {
+                    LoginDialogViewModel.RegionMan("LoginRegion");
+                }
+                else
+                {
+                    UserDialogViewModel.Region.Regions[UserDialogViewModel.UserRegionName].RemoveAll();
+                 }
+               
+            }
+            
         }
 
 

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

@@ -86,8 +86,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         }
         private void InitString()
         {
-
-            Text_passuodata = App.ServiceLoader.GetString("Text_passuodata");
+            Codemax = App.ServiceLoader.GetString("Codemax");
+            Codemin = App.ServiceLoader.GetString("Codemin");
+            Text_passuodata = App.ServiceLoader.GetString("Text_toocode");
             LoginPasswordMsg = App.ServiceLoader.GetString("LoginPasswordMsg");
             LoginPasswordMsg2 = App.ServiceLoader.GetString("LoginPasswordMsg2");
             Text_ok = App.ServiceLoader.GetString("Text_ok");
@@ -140,7 +141,6 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             set
             {
                 SetProperty(ref _LoginPassword, value);
-                PasswordUpdatalookVis = Visibility.Collapsed;
                 if (string.IsNullOrEmpty(LoginPassword))
                 {
                     ChkVis = Visibility.Collapsed;
@@ -154,7 +154,26 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         }
 
-        
+        private string _LoginPassword2 = "";
+        public string LoginPassword2
+        {
+            get { return _LoginPassword2; }
+            set
+            {
+                SetProperty(ref _LoginPassword2, value);            
+                if (string.IsNullOrEmpty(LoginPassword2))
+                {
+                    ChkVis2 = Visibility.Collapsed;
+                }
+                else
+                {
+                    ChkVis2 = Visibility.Visible;
+                }
+                CheckEnableNextStepEncrypt();
+            }
+
+        }
+
 
         private Visibility _ChkVis = Visibility.Collapsed;
         public Visibility ChkVis
@@ -197,27 +216,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
 
 
-        private string _LoginPassword2 = "";
-        public string LoginPassword2
-        {
-            get { return _LoginPassword2; }
-            set
-            {
-                SetProperty(ref _LoginPassword2, value);
-                PasswordUpdatalookVis = Visibility.Collapsed;
-                if (string.IsNullOrEmpty(LoginPassword2))
-                {
-                    ChkVis2 = Visibility.Collapsed;
-                }
-                else
-                {
-                    ChkVis2 = Visibility.Visible;
-                }
-                CheckEnableNextStepEncrypt();
-            }
-
-        }
-
+     
        
 
 
@@ -261,6 +260,26 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         }
 
 
+        private string _Codemax = "";
+        public string Codemax
+        {
+            get { return _Codemax; }
+            set
+            {
+                SetProperty(ref _Codemax, value);
+            }
+        }
+
+        private string _Codemin = "";
+        public string Codemin
+        {
+            get { return _Codemin; }
+            set
+            {
+                SetProperty(ref _Codemin, value);
+            }
+        }
+
 
         private Visibility _PasswordUpdatalookVis = Visibility.Collapsed;
         public Visibility PasswordUpdatalookVis
@@ -298,13 +317,13 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void LoginPasswordChanged()
         {
 
-            if (LoginPassword.Length < 6)
+            if (LoginPassword.Length < 6 && LoginPassword.Length > 0)
             {
-                LoginPasswordlook = "At least 6 characters";
+                LoginPasswordlook = Codemin;
             }
             else if (LoginPassword.Length > 24)
             {
-                LoginPasswordlook = "Up to 24 characters";
+                LoginPasswordlook = Codemax;
             }
             else
             {
@@ -315,13 +334,13 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void LoginPasswordChanged2()
         {
 
-            if (LoginPassword2.Length < 6)
+            if (LoginPassword2.Length < 6 && LoginPassword2.Length > 0)
             {
-                LoginPasswordlook2 = "At least 6 characters";
+                LoginPasswordlook2 = Codemin;
             }
             else if (LoginPassword2.Length > 24)
             {
-                LoginPasswordlook2 = "Up to 24 characters";
+                LoginPasswordlook2 =Codemax;
             }
             else
             {
@@ -350,10 +369,21 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             EnableNextStep = true;
 
-            if (LoginPassword.Length < 6 || LoginPassword.Length > 24 || LoginPassword2.Length < 6 || LoginPassword2.Length > 24)
+            if (LoginPassword.Length < 6 || LoginPassword.Length > 24|| (LoginPassword!= LoginPassword2))
             {
                 EnableNextStep = false;
             }
+
+            if (LoginPassword != LoginPassword2)
+            {
+                PasswordUpdatalookVis = Visibility.Visible;
+                PasswordUpdatamsglook = ErrorCodeHelper.Ercode("320");
+            }
+            else
+            {
+                PasswordUpdatalookVis = Visibility.Collapsed;
+
+            }
         }
 
         public void DisplayPassword(object e)

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

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using PDF_Master.Helper;
+using PDF_Master.Properties;
 using PDF_Master.Views.Dialog.ServiceDialog;
 using Prism.Commands;
 using Prism.Mvvm;
@@ -58,7 +60,15 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public void OnDialogOpened(IDialogParameters parameters)
         {
-            RegionMan("RegisterRegion");
+            if (ServiceHelper.IsConnectInternet() ==false)
+            {
+              
+                    RegionMan("NOInternetRegion");
+                
+              
+            }
+            else { RegionMan("RegisterRegion"); };
+           
         }
 
         RegisterDialogViewModel(IRegionManager regionManager, IDialogService dialogService)

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

@@ -360,7 +360,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void RegisterPasswordChanged()
         {
 
-           if(RegisterPassword.Length<6)
+           if(RegisterPassword.Length<6&& RegisterPassword.Length>0)
             {
                 RegisterePasswordlook = Codemin;
             }

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

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using System.Windows;
 using PDF_Master.CustomControl;
 using PDF_Master.Helper;
 using PDF_Master.Properties;
-using PDF_Master.Views.Dialog.ServiceDialog;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -41,6 +37,16 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public void OnDialogOpened(IDialogParameters parameters)
         {
+         
+
+          
+           
+          
+
+            if (ServiceHelper. IsConnectInternet()==false)
+            {
+                RegionMan("NOInternetRegion");
+            }
 
         }
 

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

@@ -23,13 +23,71 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         private int time = 60;
 
+        #region 文案
 
+        private string _Text_userout = "";
+        public string Text_userout
+        {
+            get { return _Text_userout; }
+            set { SetProperty(ref _Text_userout, value); }
+        }
+
+        private string _Text_Cancellatio = "";
+        public string Text_Cancellatio
+        {
+            get { return _Text_Cancellatio; }
+            set { SetProperty(ref _Text_Cancellatio, value); }
+        }
+
+        private string _Text_vcode = "";
+        public string Text_vcode
+        {
+            get { return _Text_vcode; }
+            set { SetProperty(ref _Text_vcode, value); }
+        }
+
+        private string _Text_novcode = "";
+        public string Text_novcode
+        {
+            get { return _Text_novcode; }
+            set { SetProperty(ref _Text_novcode, value); }
+        }
+
+        private string _Text_recode = "";
+        public string Text_recode
+        {
+            get { return _Text_recode; }
+            set { SetProperty(ref _Text_recode, value); }
+        }
+
+        private string _BtText_cancel = "";
+        public string BtText_cancel
+        {
+            get { return _BtText_cancel; }
+            set { SetProperty(ref _BtText_cancel, value); }
+        }
+
+        private void InitString()
+        {
+
+            Text_userout = App.ServiceLoader.GetString("Text_userout");
+            Text_Cancellatio = App.ServiceLoader.GetString("Text_Cancellatio");
+            Text_vcode = App.ServiceLoader.GetString("Text_vcode");
+            Text_novcode = App.ServiceLoader.GetString("Text_novcode");
+            Text_recode = App.ServiceLoader.GetString("Text_recode");
+            BtText_cancel = App.ServiceLoader.GetString("Text_cancel");
+
+        }
+
+
+        #endregion
 
         private bool _EnableNextStep =false;
         public bool EnableNextStep
         {
             get { return _EnableNextStep; }
-            set { SetProperty(ref _EnableNextStep, value); }
+            set { SetProperty(ref _EnableNextStep, value);
+            }
         }
 
 
@@ -54,13 +112,10 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             get { return _Code1; }
             set { SetProperty(ref _Code1, value);
-                if(CodeSum()==true)
-                {
-                    EnableNextStep = true;
-                }
-                else
+                if (CodeSum())
                 {
-                    EnableNextStep = false;
+                    Code6Changed();
+
                 }
             }
         }
@@ -72,13 +127,10 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             get { return _Code2; }
             set { SetProperty(ref _Code2, value);
-                if (CodeSum() == true)
-                {
-                    EnableNextStep = true;
-                }
-                else
+                if (CodeSum())
                 {
-                    EnableNextStep = false;
+                    Code6Changed();
+
                 }
             }
         }
@@ -90,13 +142,10 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             get { return _Code3; }
             set { SetProperty(ref _Code3, value);
-                if (CodeSum() == true)
-                {
-                    EnableNextStep = true;
-                }
-                else
+                if (CodeSum())
                 {
-                    EnableNextStep = false;
+                    Code6Changed();
+
                 }
             }
         }
@@ -107,13 +156,10 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             get { return _Code4; }
             set { SetProperty(ref _Code4, value);
-                if (CodeSum() == true)
-                {
-                    EnableNextStep = true;
-                }
-                else
+                if (CodeSum())
                 {
-                    EnableNextStep = false;
+                    Code6Changed();
+
                 }
             }
         }
@@ -125,13 +171,10 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             get { return _Code5; }
             set { SetProperty(ref _Code5, value);
-                if (CodeSum() == true)
-                {
-                    EnableNextStep = true;
-                }
-                else
+                if (CodeSum())
                 {
-                    EnableNextStep = false;
+                    Code6Changed();
+
                 }
             }
         }
@@ -141,16 +184,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public string Code6
         {
             get { return _Code6; }
-            set { SetProperty(ref _Code6, value);
-                if (CodeSum() == true)
-                {
-                    EnableNextStep = true;
-                }
-                else
-                {
-                    EnableNextStep = false;
-                }
-            }
+            set { SetProperty(ref _Code6, value);}
         }
 
         private string _UserCodemsg = "";
@@ -198,7 +232,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand UserOutCancelCommand { get; set; }
         public DelegateCommand CodetooCommand { get; set; }
-  
+        public DelegateCommand Code6ChangedCommand { get; set; }
         public DelegateCommand UserOutCommand { get; set; }
 
         public UserOutCodeRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
@@ -209,9 +243,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             dialogs = dialogService;
             UserOutCancelCommand = new DelegateCommand(UserOutCancel);
             CodetooCommand = new DelegateCommand(Codetoo);
-
+            Code6ChangedCommand = new DelegateCommand(Code6Changed);
             UserOutCommand = new DelegateCommand(UserOut);
-
+            InitString();
 
         }
 
@@ -228,15 +262,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
 
             Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
-            if (Codesum.Length == 6)
+            if (CodeSum()==true)
             {
-                
-                    
-                    if (ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off") == "200")
-                    {
-                        
-                        if (ServiceHelper.Usergout(Codesum) == "200")
-                        {
+           
                         Settings.Default.AppProperties.LoginToken = "";
                         App.IsLogin =false;
                         Settings.Default.Save();
@@ -244,28 +272,54 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                         App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                         App.mainWindowViewModel.LoginVis = Visibility.Visible;
                         UserDialogViewModel.Close();
-                        }
-                        else
-                        {
-                             UserCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Usergout(Codesum));
-                              UserCodemsgVis = Visibility.Visible;
-                        }
+                       
+
+            }
+         
+
+        }
+
+        //第六个密码框改变
+        private void Code6Changed()
+        {
+
+            Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
+            if (CodeSum() == true)
+            {
+
+
+                if (ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off") == "200")
+                {
+
+                    if (ServiceHelper.Usergout(Codesum) == "200")
+                    {
+                        EnableNextStep = true;
                     }
                     else
                     {
-                           UserCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off"));
-                          UserCodemsgVis = Visibility.Visible;
+                        EnableNextStep = false;
+                        UserCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Usergout(Codesum));
+                        UserCodemsgVis = Visibility.Visible;
                     }
-                
-               
+                }
+                else
+                {
+                    EnableNextStep = false;
+                    UserCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off"));
+                    UserCodemsgVis = Visibility.Visible;
+                }
+
 
             }
             else
             {
-                UserCodemsg = "Please enter a six digit verification code";
+                EnableNextStep = false;
             }
-
         }
+
+
+
+
         private bool CodeSum()
         {
             Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
@@ -297,12 +351,12 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             if (time == 0)
             {
                 Codeagin = Visibility.Visible;
-                Codetime = "";
+                Codetime = " ";
             }
             else
             {
                 time--;
-                Codetime = "(" + time.ToString() + ")";
+                Codetime = " (" + time.ToString() + ")";
             }
         }
 

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -332,45 +332,29 @@ namespace PDF_Master.ViewModels
 
                 App.IsFirstOpen = false;
 
-                if (Settings.Default.AppProperties.LoginToken != "")
-                {
-                    
-                    if(ServiceHelper.GetUser()=="false")
-                    {
-                       
-                        LoginVis = Visibility.Visible;
-                        LoginDialogViewModel.RegionMan("NOInternetRegion");
-                        
-                        OphVis = Visibility.Visible;
-
-                    }
-                    else 
-                    {
-
-                        UserVis = Visibility.Visible;
-                    }
-                }
-                else
-                {
-                    LoginVis = Visibility.Visible;
-                    OphVis = Visibility.Visible;
-                }
-
+                
 
             }
-            else
+            //判断本地有没有token，没有显示登录，有再判断登录状态
+            if (Settings.Default.AppProperties.LoginToken != "")
             {
+
                 if (ServiceHelper.GetUser() == "false")
                 {
-
                     LoginVis = Visibility.Visible;
-
+                    OphVis = Visibility.Visible;
                 }
                 else
                 {
                     UserVis = Visibility.Visible;
                 }
             }
+            else
+            {
+                LoginVis = Visibility.Visible;
+                OphVis = Visibility.Visible;
+            }
+
             InitString();
         }
 

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -2182,9 +2182,14 @@ namespace PDF_Master.ViewModels.PageEdit
         /// <param name="endIndex"></param>
         private async void RefreshItemImage(int startIndex, int endIndex)
         {
+            if(PDFViewer==null||PDFViewer.Document==null)
+            {
+                return;
+            }
+
             for (int i = startIndex; i <= endIndex; i++)
             {
-                if (i <= PageEditItems.Count - 1 && i >= 0 && PageEditItems.Count > 0)
+                if (i <= PageEditItems.Count - 1 && i >= 0 && PageEditItems.Count > 0&&PDFViewer.Document!=null)
                 {
                     //先更新一次每个页面的尺寸 确保图的方向正确
                     PageEditItems[i].Size = PDFViewer.Document.GetPageSize(i);

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

@@ -51,113 +51,157 @@
                     FontStyle="Normal"
                     Text="{Binding Text_vcode}" />
                 <WrapPanel Margin="0,8,0,0" HorizontalAlignment="Left">
-                    <TextBox
-                        x:Name="text_Code1"
-                        Width="36"
-                        Height="42"
-                        Padding="10,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code1_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Text="{Binding Code1, Mode=TwoWay}"
-                        TextChanged="Code_TextChanged" />
-                    <TextBox
-                        x:Name="text_Code2"
-                        Width="36"
-                        Height="42"
-                        Margin="9,0,0,0"
-                        Padding="10,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code2_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code3_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code4_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code5_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code6_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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>
+                    <Grid>
+                        <TextBox
+                            x:Name="text_Code1"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code1_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code1, Mode=TwoWay}"
+                            TextChanged="Code_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code2"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code2_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code2, Mode=TwoWay}"
+                            TextChanged="text_Code2_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code3"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code3_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code3, Mode=TwoWay}"
+                            TextChanged="text_Code3_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code4"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code4_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code4, Mode=TwoWay}"
+                            TextChanged="text_Code4_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code5"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code5_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code5, Mode=TwoWay}"
+                            TextChanged="text_Code5_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code6"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code6_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            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>
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+
                 </WrapPanel>
                 <WrapPanel Margin="0,10,0,0">
                     <TextBlock
@@ -188,8 +232,8 @@
                         LineHeight="20"
                         Visibility="{Binding Codeagin, Mode=TwoWay}">
                         <Hyperlink Command="{Binding CodetooCommand}">
-                            <TextBlock Text="{Binding Text_recode}"/>
-                            </Hyperlink>
+                            <TextBlock Text="{Binding Text_recode}" />
+                        </Hyperlink>
                     </TextBlock>
                 </WrapPanel>
             </StackPanel>
@@ -208,7 +252,7 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     Command="{Binding RegisterNextCommand}"
-                    Content="Sign up"
+                    Content="{Binding Text_Signup}"
                     IsDefault="True"
                     IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
                     Style="{StaticResource Btn.cta}" />
@@ -224,8 +268,8 @@
                     Foreground="#1770F4"
                     LineHeight="20">
                     <Hyperlink Command="{Binding BackRegisterLastCommand}">
-                        <TextBlock Text="{Binding Text_back}"/>
-                        </Hyperlink>
+                        <TextBlock Text="{Binding Text_back}" />
+                    </Hyperlink>
                 </TextBlock>
             </StackPanel>
 
@@ -238,7 +282,7 @@
             VerticalAlignment="Bottom"
             Background="#FDC7C6"
             Visibility="{Binding RegisterCodemsgVis, Mode=TwoWay}">
-            <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
                 <Border
                     Width="14"
                     Height="14"
@@ -251,6 +295,7 @@
                         Fill="White" />
                 </Border>
                 <TextBlock
+                    Margin="9,0,0,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontFamily="Segoe UI"

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

@@ -16,7 +16,9 @@
             <ColumnDefinition Width="260"/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Grid Background="#273C62"/>
+        <Grid >
+            <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/Login.png" />
+        </Grid>
         <Grid Grid.Column="1" >
             <ContentControl prism:RegionManager.RegionName="{Binding LoginRegionName}" Visibility="Visible"/>
         </Grid>

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

@@ -2,6 +2,7 @@
     x:Class="PDF_Master.Views.Dialog.ServiceDialog.LoginPasswordRegion"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:convert="clr-namespace:PDF_Master.DataConvert"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Master.Helper"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
@@ -13,6 +14,8 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <UserControl.Resources>
+        <convert:LoginBordVis x:Key="LoginBordVis" />
+
         <Style x:Key="EyeCheckbox" TargetType="CheckBox">
             <Setter Property="Cursor" Value="Hand" />
             <Setter Property="Template">
@@ -96,6 +99,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -152,6 +156,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -208,6 +213,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -264,6 +270,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginEmail}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -306,7 +313,7 @@
                     FontSize="20"
                     FontStyle="Normal"
                     FontWeight="SemiBold"
-                    Text="{Binding Text_login}" />
+                    Text="{Binding Text_Login}" />
                 <WrapPanel Margin="0,34,0,0">
                     <TextBlock
                         Width="Auto"
@@ -328,7 +335,7 @@
                         Foreground="#1770F4"
                         LineHeight="20">
                         <Hyperlink Command="{Binding ChangeEmailCommand}">
-                            <TextBlock Text="{Binding Text_chmail}"/>
+                            <TextBlock Text="{Binding Text_chmail}" />
                         </Hyperlink>
                     </TextBlock>
                 </WrapPanel>
@@ -341,53 +348,63 @@
                     FontSize="14"
                     FontStyle="Normal"
                     Text="{Binding Text_enterpass}" />
-                <Grid
-                    Width="262"
-                    Height="32"
-                    Margin="0,8,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="24" />
-                    </Grid.ColumnDefinitions>
-                    <PasswordBox
-                        x:Name="Text_Password"
-                        Grid.ColumnSpan="2"
-                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg0, Mode=TwoWay}"
-                        help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Style="{StaticResource LoginPasswordBoxStyle}"
-                        Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
-                    <TextBox
-                        Grid.ColumnSpan="2"
+                <Grid Margin="0,8,0,0">
+                    <Grid
                         Width="262"
+                        Height="32"
                         HorizontalAlignment="Left"
-                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg0, Mode=TwoWay}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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}" />
+                        VerticalAlignment="Top">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="24" />
+                        </Grid.ColumnDefinitions>
+                        <PasswordBox
+                            x:Name="Text_Password"
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg0, Mode=TwoWay}"
+                            help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Style="{StaticResource LoginPasswordBoxStyle}"
+                            Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
+                        <TextBox
+                            Grid.ColumnSpan="2"
+                            Width="262"
+                            HorizontalAlignment="Left"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg0, Mode=TwoWay}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            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>
+                    <Border
+                        BorderBrush="#F3465B"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Effect="{StaticResource shadow.red-0-4}"
+                        Visibility="{Binding ElementName=Textbl_password, Path=Text, Converter={StaticResource LoginBordVis}}" />
+
                 </Grid>
+
                 <TextBlock
+                    x:Name="Textbl_password"
                     Width="262"
                     Height="20"
                     Margin="0,2,0,0"
@@ -416,7 +433,7 @@
                     Foreground="#1770F4"
                     LineHeight="20">
                     <Hyperlink Command="{Binding GoCodeUpdataCommand}">
-                        <TextBlock Text="{Binding Text_forgetpass}"/>
+                        <TextBlock Text="{Binding Text_forgetpass}" />
                     </Hyperlink>
                 </TextBlock>
             </StackPanel>
@@ -429,7 +446,7 @@
             VerticalAlignment="Bottom"
             Background="#FDC7C6"
             Visibility="{Binding LoginPasswordlookVis}">
-            <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
                 <Border
                     Width="14"
                     Height="14"
@@ -442,6 +459,7 @@
                         Fill="White" />
                 </Border>
                 <TextBlock
+                    Margin="9,0,0,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontFamily="Segoe UI"

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

@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Master.Helper"
     xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
+    xmlns:convert="clr-namespace:PDF_Master.DataConvert"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     Width="326"
@@ -12,6 +13,7 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <UserControl.Resources>
+        <convert:LoginBordVis x:Key="LoginBordVis" />
         <Style x:Key="EyeCheckbox" TargetType="CheckBox">
             <Setter Property="Cursor" Value="Hand" />
             <Setter Property="Template">
@@ -95,6 +97,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                 <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -151,6 +154,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -207,6 +211,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -263,6 +268,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginEmail}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -325,8 +331,16 @@
                             help:PasswordBoxHelper.DisplayText="{Binding LoginEmailMsg, Mode=TwoWay}"
                             Style="{StaticResource LoginEmailTextBoxStyle}"
                             Text="{Binding LoginEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        <Border
+                        BorderBrush="#F3465B"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Effect="{StaticResource shadow.red-0-4}"
+                        Visibility="{Binding ElementName=Textbl_email, Path=Text, Converter={StaticResource LoginBordVis}}" />
+
                     </Grid>
                     <TextBlock
+                        x:Name="Textbl_email"
                         Width="262"
                         Height="Auto"
                         Margin="0,2,0,0"

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

@@ -5,6 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Master.Helper"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+       xmlns:convert="clr-namespace:PDF_Master.DataConvert"
+
     xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
@@ -13,6 +15,7 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <UserControl.Resources>
+        <convert:LoginBordVis x:Key="LoginBordVis" />
         <Style x:Key="EyeCheckbox" TargetType="CheckBox">
             <Setter Property="Cursor" Value="Hand" />
             <Setter Property="Template">
@@ -96,6 +99,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -152,6 +156,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword2}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -208,6 +213,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -264,6 +270,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -320,6 +327,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginPassword2}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -376,6 +384,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=LoginEmail}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -411,6 +420,7 @@
             <StackPanel>
                 <TextBlock
                     Height="28"
+                    Width="Auto"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontFamily="Segoe UI"
@@ -418,16 +428,17 @@
                     FontStyle="Normal"
                     FontWeight="SemiBold"
                     Text="{Binding Text_passuodata}" />
-                <Grid
+                <Grid  Margin="0,32,0,0">
+                    <Grid
                     Width="262"
                     Height="32"
-                    Margin="0,32,0,0"
+                   
                     VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="24" />
-                    </Grid.ColumnDefinitions>
-                    <PasswordBox
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="24" />
+                        </Grid.ColumnDefinitions>
+                        <PasswordBox
                          x:Name="Text_RePassword2"
                         Grid.ColumnSpan="2"
                         help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
@@ -436,7 +447,7 @@
                         PreviewTextInput="TextBox_PreviewTextInput"
                         Style="{StaticResource LoginPasswordBoxStyle2}"
                         Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
-                    <TextBox
+                        <TextBox
                        
                         Grid.ColumnSpan="2"
                         help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
@@ -445,14 +456,14 @@
                         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>
+                            <i:Interaction.Triggers>
+                                <i:EventTrigger EventName="TextChanged">
+                                    <i:InvokeCommandAction Command="{Binding LoginPasswordChanged2Command}" />
+                                </i:EventTrigger>
+                            </i:Interaction.Triggers>
+                        </TextBox>
 
-                    <CheckBox
+                        <CheckBox
                         x:Name="DisplayLoginPasswordChk2"
                         Grid.Column="1"
                         Height="16"
@@ -463,23 +474,34 @@
                         Style="{StaticResource EyeCheckbox}"
                         Visibility="{Binding ChkVis2}" />
 
+                    </Grid>
+                    <Border
+                        BorderBrush="#F3465B"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Effect="{StaticResource shadow.red-0-4}"
+                        Visibility="{Binding ElementName=Textbl_pass1, Path=Text, Converter={StaticResource LoginBordVis}}" />
                 </Grid>
+               
+
                 <TextBlock
+                    x:Name="Textbl_pass1"
                     Grid.ColumnSpan="2"
                     Width="262"
                     Height="20"
                     Margin="0,2,0,0"
                     Foreground="#F3465B"
                     Text="{Binding LoginPasswordlook2, Mode=TwoWay}" />
-                <Grid
+                <Grid  Margin="0,8,0,0">
+                    <Grid
                     Width="262"
                     Height="32"
-                    Margin="0,8,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="24" />
-                    </Grid.ColumnDefinitions>
-                    <PasswordBox
+                   >
+                        <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}"
@@ -487,7 +509,7 @@
                         PreviewTextInput="TextBox_PreviewTextInput"
                         Style="{StaticResource LoginPasswordBoxStyle}"
                         Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
-                    <TextBox
+                        <TextBox
                         Grid.ColumnSpan="2"
                         help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
                         InputMethod.IsInputMethodEnabled="False"
@@ -495,13 +517,13 @@
                         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
+                            <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"
@@ -511,8 +533,19 @@
                         CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
                         Style="{StaticResource EyeCheckbox}"
                         Visibility="{Binding ChkVis}" />
+                    </Grid>
+                    <Border
+                        BorderBrush="#F3465B"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Effect="{StaticResource shadow.red-0-4}"
+                        Visibility="{Binding ElementName=Textbl_pass2, Path=Text, Converter={StaticResource LoginBordVis}}" />
                 </Grid>
+               
+
+
                 <TextBlock
+                    x:Name="Textbl_pass2"
                     Width="262"
                     Height="20"
                     Margin="0,4,0,0"
@@ -529,13 +562,15 @@
                     Style="{StaticResource Btn.cta}" />
             </StackPanel>
         </Grid>
+        
+        
         <Grid
             Width="326"
             Height="82"
             VerticalAlignment="Bottom"
             Background="#FDC7C6"
             Visibility="{Binding PasswordUpdatalookVis}">
-            <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
                 <Border
                     Width="14"
                     Height="14"
@@ -548,6 +583,7 @@
                         Fill="White" />
                 </Border>
                 <TextBlock
+                    Margin="9,0,0,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontFamily="Segoe UI"

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

@@ -16,7 +16,9 @@
             <ColumnDefinition Width="260"/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Grid Background="#273C62"/>
+        <Grid >
+            <Image Source="pack://application:,,,/Resources/Service/Login.png" />
+        </Grid>
         <Grid Grid.Column="1" >
             <ContentControl prism:RegionManager.RegionName="{Binding RegisterRegionName}" Visibility="Visible"/>
         </Grid>

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

@@ -37,7 +37,9 @@
                     Height="128"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
-                    Background="#D9D9D9" />
+                     >
+                    <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/Regiserok.png"/>
+                </Grid>
                 <TextBlock
                     Width="186"
                     Height="28"

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

@@ -2,6 +2,8 @@
     x:Class="PDF_Master.Views.Dialog.ServiceDialog.RegisterRegion"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:CustomControl="clr-namespace:PDF_Master.CustomControl"
+    xmlns:convert="clr-namespace:PDF_Master.DataConvert"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Master.Helper"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
@@ -13,6 +15,7 @@
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <UserControl.Resources>
+        <convert:LoginBordVis x:Key="LoginBordVis" />
         <Style x:Key="EyeCheckbox" TargetType="CheckBox">
             <Setter Property="Cursor" Value="Hand" />
             <Setter Property="Template">
@@ -71,6 +74,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -79,6 +83,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -96,6 +101,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=RegisterPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -152,6 +158,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=RegisterPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -183,6 +190,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -191,6 +199,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -208,6 +217,7 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=RegisterPassword}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -239,6 +249,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -247,6 +258,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -264,6 +276,8 @@
                             </Trigger>
                             <Trigger Property="IsKeyboardFocused" Value="true">
                                 <Setter TargetName="border" Property="BorderBrush" Value="#FF569DE5" />
+                                <Setter TargetName="border" Property="Effect" Value="{StaticResource shadow.blue-0-4}" />
+
                             </Trigger>
                             <DataTrigger Binding="{Binding Path=RegisterEmail}" Value="">
                                 <Setter TargetName="markText" Property="Visibility" Value="Visible" />
@@ -321,8 +335,16 @@
                         help:PasswordBoxHelper.DisplayText="{Binding RegisterEmailMsg, Mode=TwoWay}"
                         Style="{StaticResource RegisterEmailTextBoxStyle}"
                         Text="{Binding RegisterEmail, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    <Border
+                        BorderBrush="#F3465B"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Effect="{StaticResource shadow.red-0-4}"
+                        Visibility="{Binding ElementName=Textbl_email, Path=Text, Converter={StaticResource LoginBordVis}}" />
+
                 </Grid>
                 <TextBlock
+                    x:Name="Textbl_email"
                     Width="262"
                     Height="20"
                     Margin="0,2,0,0"
@@ -330,53 +352,60 @@
                     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"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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"
+                <Grid Margin="0,8,0,0">
+                    <Grid
+                        Width="262"
+                        Height="32"
                         HorizontalAlignment="Left"
-                        Panel.ZIndex="1"
-                        Command="{Binding DisplayPasswordCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                        IsChecked="{Binding IsRegisterPasswordDisplayed, Mode=TwoWay}"
-                        Style="{StaticResource EyeCheckbox}"
-                        Visibility="{Binding ChkVis}" />
+                        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}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Style="{StaticResource RegisterPasswordBoxStyle}"
+                            Visibility="{Binding RegisterPasswordVisibility, Mode=TwoWay}" />
+                        <TextBox
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding RegisterPasswordMsg, Mode=TwoWay}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            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>
+                    <Border
+                        BorderBrush="#F3465B"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        Effect="{StaticResource shadow.red-0-4}"
+                        Visibility="{Binding ElementName=Textbl_password, Path=Text, Converter={StaticResource LoginBordVis}}" />
                 </Grid>
                 <TextBlock
+                    x:Name="Textbl_password"
                     Width="262"
                     Height="20"
                     Margin="0,2,0,0"
@@ -410,15 +439,15 @@
                     <TextBlock
                         Width="37"
                         Height="20"
-                        FontFamily="Segoe UI"
                         Margin="2,0,0,0"
+                        FontFamily="Segoe UI"
                         FontSize="12"
                         FontWeight="Normal"
                         Foreground="#1770F4"
                         LineHeight="20">
                         <Hyperlink Command="{Binding GoLoginCommand}">
-                             <TextBlock Text="{Binding Text_Login}"/>
-                           </Hyperlink>
+                            <TextBlock Text="{Binding Text_Login}" />
+                        </Hyperlink>
                     </TextBlock>
                 </WrapPanel>
                 <TextBlock
@@ -437,19 +466,17 @@
                     <Hyperlink
                         Command="{Binding LinkPolicyCommand}"
                         NavigateUri="{Binding UriPolivy}"
-                        TextDecorations="Underline"
-                        
-                        >
-                        <TextBlock Text="{Binding Text_privary}"/>
-                       
+                        TextDecorations="Underline">
+                        <TextBlock Text="{Binding Text_privary}" />
+
                     </Hyperlink>
                     <Run Text="{Binding Text_and}" />
                     <Hyperlink
                         Command="{Binding LinkLicenseCommand}"
                         NavigateUri="{Binding UriLicense}"
                         TextDecorations="Underline">
-                       
-                        <TextBlock Text="{Binding Text_licens}"/>
+
+                        <TextBlock Text="{Binding Text_licens}" />
                     </Hyperlink>
                 </TextBlock>
             </StackPanel>

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

@@ -39,7 +39,7 @@
                     FontStyle="Normal"
                     FontWeight="SemiBold"
                     LineHeight="28"
-                    Text="Cancel account" />
+                    Text="{Binding Text_userout}" />
                 <TextBlock
                     Margin="0,32,0,0"
                     HorizontalAlignment="Left"
@@ -47,109 +47,159 @@
                     FontSize="14"
                     FontStyle="Normal"
                     LineHeight="22"
-                    Text="Enter the verification code" />
+                    Text="{Binding Text_vcode}" />
                 <WrapPanel Margin="0,8,0,0" HorizontalAlignment="Left">
-                    <TextBox
-                        x:Name="text_Code1"
-                        Width="36"
-                        Height="42"
-                        Padding="10,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code1_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Text="{Binding Code1, Mode=TwoWay}"
-                        TextChanged="Code_TextChanged" />
-                    <TextBox
-                        x:Name="text_Code2"
-                        Width="36"
-                        Height="42"
-                        Margin="9,0,0,0"
-                        Padding="10,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code2_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code3_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code4_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code5_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        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,0,10,0"
-                        HorizontalAlignment="Right"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Segoe UI"
-                        FontSize="20"
-                        FontStyle="Normal"
-                        FontWeight="SemiBold"
-                        InputMethod.IsInputMethodEnabled="False"
-                        KeyUp="text_Code6_KeyUp"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Text="{Binding Code6, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        TextChanged="text_Code6_TextChanged" />
+                    <Grid>
+                        <TextBox
+                            x:Name="text_Code1"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code1_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code1, Mode=TwoWay}"
+                            TextChanged="Code_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code2"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code2_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code2, Mode=TwoWay}"
+                            TextChanged="text_Code2_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code3"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code3_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code3, Mode=TwoWay}"
+                            TextChanged="text_Code3_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code4"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code4_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code4, Mode=TwoWay}"
+                            TextChanged="text_Code4_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code5"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code5_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Text="{Binding Code5, Mode=TwoWay}"
+                            TextChanged="text_Code5_TextChanged" />
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+                    <Grid Margin="9,0,0,0">
+                        <TextBox
+                            x:Name="text_Code6"
+                            Width="36"
+                            Height="42"
+                            Padding="10,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalContentAlignment="Center"
+                            Effect="{StaticResource shadow.blue-0-4}"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontStyle="Normal"
+                            FontWeight="SemiBold"
+                            InputMethod.IsInputMethodEnabled="False"
+                            KeyUp="text_Code6_KeyUp"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            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>
+                        <Border
+                            BorderBrush="#F3465B"
+                            BorderThickness="1"
+                            Effect="{StaticResource shadow.red-0-4}"
+                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                    </Grid>
+
                 </WrapPanel>
                 <WrapPanel Margin="0,10,0,0">
                     <TextBlock
@@ -160,7 +210,7 @@
                         FontFamily="Segoe UI"
                         FontSize="12"
                         FontStyle="Normal"
-                        Text="Didn't receive the verification code?" />
+                        Text="{Binding Text_novcode}" />
                     <TextBlock
                         Width="Auto"
                         Height="20"
@@ -179,7 +229,9 @@
                         Foreground="#1770F4"
                         LineHeight="20"
                         Visibility="{Binding Codeagin, Mode=TwoWay}">
-                        <Hyperlink Command="{Binding CodetooCommand}">Click to resend</Hyperlink>
+                        <Hyperlink Command="{Binding CodetooCommand}">
+                            <TextBlock Text="{Binding Text_recode}"/>
+                        </Hyperlink>
                     </TextBlock>
                 </WrapPanel>
                 <Button
@@ -190,19 +242,20 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
                     Command="{Binding UserOutCommand}"
-                    Content="Cancellation"
+                    Content="{Binding BtText_userout}"
                     IsDefault="True"
                     IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-                    Style="{StaticResource Btn.cta}" />
+                    Style="{StaticResource btn.brand}" />
                 <Button
                     Width="200"
                     Height="32"
                     Margin="0,8,0,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
+                    Content="{Binding BtText_cancel}"
                     Command="{Binding UserOutCancelCommand}"
-                    Style="{StaticResource btn.ghost}">
-                    <TextBlock Text="Cancel" />
+                    Style="{StaticResource btn.sec}">
+                    
                 </Button>
             </StackPanel>
         </Grid>
@@ -219,7 +272,7 @@
             VerticalAlignment="Bottom"
             Background="#FDC7C6"
             Visibility="{Binding UserCodemsgVis, Mode=TwoWay}">
-            <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
                 <Border
                     Width="14"
                     Height="14"
@@ -232,6 +285,7 @@
                         Fill="White" />
                 </Border>
                 <TextBlock
+                    
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontFamily="Segoe UI"

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

@@ -53,11 +53,13 @@
                     Height="32"
                     Margin="296,32,0,0"
                     HorizontalAlignment="Left"
-                    Background="#1770F4"
+                    
                     Content="{Binding Text_ok}"
-                    Foreground="White"
+                   
                     IsCancel="True"
-                    IsDefault="True" />
+                    IsDefault="True"
+                     Style="{StaticResource Btn.cta}"
+                    />
             </StackPanel>
         </Grid>
     </Grid>

PDF Office/Views/PageEdit/PageEditContent.xaml

@@ -46,13 +46,14 @@
                                 Background="Transparent">
                                 <Image Source="{Binding Image}" Stretch="Uniform" />
                                 <Border
-                                    Width="10"
-                                    Height="10"
+                                    Width="18"
+                                    Height="20"
                                     Margin="0,10,10,0"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Top"
-                                    Background="Yellow"
-                                    Visibility="{Binding HaveBookMark, Converter={StaticResource BoolToVisibleConvert}}" />
+                                    Visibility="{Binding HaveBookMark, Converter={StaticResource BoolToVisibleConvert}}">
+                                    <Path Data="M1.75 17.7778V0H0.25V19C0.25 19.2608 0.385462 19.5028 0.607729 19.6392C0.829997 19.7756 1.10716 19.7868 1.33966 19.6687L9 15.7775L16.6603 19.6687C16.8928 19.7868 17.17 19.7756 17.3923 19.6392C17.6145 19.5028 17.75 19.2608 17.75 19V0H16.25V17.7778L9.33966 14.2676C9.1262 14.1592 8.8738 14.1592 8.66034 14.2676L1.75 17.7778Z" Stroke="{StaticResource color.icon.base.accent}" />
+                                </Border>
                             </Grid>
                         </Border>
 
@@ -155,7 +156,7 @@
         <KeyBinding Command="{Binding CutCommand}" Gesture="Ctrl+X" />
         <KeyBinding Command="{Binding RightRotateCommand}" Gesture="Ctrl+R" />
         <KeyBinding Command="{Binding LeftRotateCommand}" Gesture="Ctrl+L" />
-        <KeyBinding Command="{Binding DeleteCommand}" Gesture="Delete"/>
+        <KeyBinding Command="{Binding DeleteCommand}" Gesture="Delete" />
         <KeyBinding Key="Esc" Command="{Binding ClearSelectedCommand}" />
         <KeyBinding
             Key="Add"
@@ -353,8 +354,15 @@
                 ScrollBar.Scroll="ListPageEdit_Scroll"
                 ScrollViewer.ScrollChanged="ListPageEdit_ScrollChanged"
                 SelectedIndex="{Binding ListSelectedIndex, Mode=TwoWay}"
-                SelectionMode="Extended">
-                <!--  此处要用循环模式，否则滚动时容易误触发EndSscroll 从而频繁拿图导致卡顿  -->
+                SelectionMode="Extended"
+                VirtualizingPanel.CacheLength="1"
+                VirtualizingPanel.CacheLengthUnit="Page"
+                VirtualizingPanel.ScrollUnit="Pixel"
+                VirtualizingPanel.VirtualizationMode="Standard">
+                <!--
+                    此处要用循环模式，否则滚动时容易误触发EndSscroll 从而频繁拿图导致卡顿
+                    VirtualizingPanel.ScrollUnit="Pixel" 设置鼠标每次滚动的步进值
+                -->
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="{x:Type ListBoxItem}">
                         <Setter Property="Template" Value="{StaticResource ListBoxItemControlTemplate}" />

PDF Office/Views/PageEdit/PageEditContent.xaml.cs

@@ -107,6 +107,8 @@ namespace PDF_Master.Views.PageEdit
             {
                 ItemSuitAcutalWidth(this.ActualWidth);
             }
+            //页面总数变化后用于通知BOTA面板进行数据集刷新
+            eventor.GetEvent<PageEditNotifyEvent>().Publish(new PageEditNotifyEventArgs(unicode,NotifyType.PageCountChanged));
         }
 
         public PageEditContent(IEventAggregator eventAggregator) : this()