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

PDF Office/App.xaml.cs

@@ -501,6 +501,7 @@ namespace PDF_Master
             containerRegistry.RegisterForNavigation<EnterReadModeTip>();
 
             //轻会员
+            containerRegistry.RegisterForNavigation<UserOutOKRegion>();
             containerRegistry.RegisterForNavigation<CodeRegion>();
             containerRegistry.RegisterForNavigation<LoginRegion>();
             containerRegistry.RegisterForNavigation<LoginPasswordRegion>();

PDF Office/Helper/ErrorCodeHelper.cs

@@ -266,6 +266,16 @@ namespace PDF_Master.Helper
             }
         }
 
+        private string _code327 = "";
+        public string code327
+        {
+            get { return _code327; }
+            set
+            {
+                SetProperty(ref _code327, value);
+            }
+        }
+
         private string _code300 = "";
         public string code300
         {
@@ -275,6 +285,16 @@ namespace PDF_Master.Helper
                 SetProperty(ref _code300, value);
             }
         }
+
+        private string _codehad = "";
+        public string codehad
+        {
+            get { return _codehad; }
+            set
+            {
+                SetProperty(ref _codehad, value);
+            }
+        }
         public void InitString()
         {
             
@@ -303,8 +323,9 @@ namespace PDF_Master.Helper
             code324 = App.ServiceLoader.GetString("code324");
             code325 = App.ServiceLoader.GetString("code325");
             code326 = App.ServiceLoader.GetString("code326");
+            code326 = App.ServiceLoader.GetString("code327");
             code300 = App.ServiceLoader.GetString("code300");
-
+            codehad= App.ServiceLoader.GetString("codehad");
         }
 
         
@@ -366,6 +387,10 @@ namespace PDF_Master.Helper
                 return code325;
             else if (code == "326")
                 return code326;
+            else if (code == "327")
+                return code327;
+            else if (code == "codehad")
+                return codehad;
             else
                 return code300;
         }

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -215,8 +215,8 @@
           <target state="new">Register error!</target>
         </trans-unit>
         <trans-unit id="code311" translate="yes" xml:space="preserve">
-          <source>The password is incorrect, please re-enter it</source>
-          <target state="new">The password is incorrect, please re-enter it</target>
+          <source>Wrong password. You can check whether the letter is uppercase or lowercase.</source>
+          <target state="new">Wrong password. You can check whether the letter is uppercase or lowercase.</target>
         </trans-unit>
         <trans-unit id="code312" translate="yes" xml:space="preserve">
           <source>Incorrect code</source>
@@ -255,12 +255,12 @@
           <target state="new">Passwords are different. Please re-enter them.</target>
         </trans-unit>
         <trans-unit id="code321" translate="yes" xml:space="preserve">
-          <source>At least 6 characters</source>
-          <target state="new">At least 6 characters</target>
+          <source>Password must be 6-24 characters</source>
+          <target state="new">Password must be 6-24 characters</target>
         </trans-unit>
         <trans-unit id="code322" translate="yes" xml:space="preserve">
-          <source>Up to 24 characters</source>
-          <target state="new">Up to 24 characters</target>
+          <source>Password must be 6-24 characters</source>
+          <target state="new">Password must be 6-24 characters</target>
         </trans-unit>
         <trans-unit id="code323" translate="yes" xml:space="preserve">
           <source>Please add auth config</source>
@@ -390,6 +390,22 @@
           <source>Unregistered</source>
           <target state="new">Unregistered</target>
         </trans-unit>
+        <trans-unit id="code327" translate="yes" xml:space="preserve">
+          <source>Spaces are not allowed in password</source>
+          <target state="new">Spaces are not allowed in password</target>
+        </trans-unit>
+        <trans-unit id="codehad" translate="yes" xml:space="preserve">
+          <source>Enter an existing verification code</source>
+          <target state="new">Enter an existing verification code</target>
+        </trans-unit>
+        <trans-unit id="Text_useroutok" translate="yes" xml:space="preserve">
+          <source>Cancellation Submitted</source>
+          <target state="new">Cancellation Submitted</target>
+        </trans-unit>
+        <trans-unit id="Text_useroutoktext" translate="yes" xml:space="preserve">
+          <source>Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</source>
+          <target state="new">Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -215,8 +215,8 @@
           <target state="new">Register error!</target>
         </trans-unit>
         <trans-unit id="code311" translate="yes" xml:space="preserve">
-          <source>The password is incorrect, please re-enter it</source>
-          <target state="new">The password is incorrect, please re-enter it</target>
+          <source>Wrong password. You can check whether the letter is uppercase or lowercase.</source>
+          <target state="new">Wrong password. You can check whether the letter is uppercase or lowercase.</target>
         </trans-unit>
         <trans-unit id="code312" translate="yes" xml:space="preserve">
           <source>Incorrect code</source>
@@ -255,12 +255,12 @@
           <target state="new">Passwords are different. Please re-enter them.</target>
         </trans-unit>
         <trans-unit id="code321" translate="yes" xml:space="preserve">
-          <source>At least 6 characters</source>
-          <target state="new">At least 6 characters</target>
+          <source>Password must be 6-24 characters</source>
+          <target state="new">Password must be 6-24 characters</target>
         </trans-unit>
         <trans-unit id="code322" translate="yes" xml:space="preserve">
-          <source>Up to 24 characters</source>
-          <target state="new">Up to 24 characters</target>
+          <source>Password must be 6-24 characters</source>
+          <target state="new">Password must be 6-24 characters</target>
         </trans-unit>
         <trans-unit id="code323" translate="yes" xml:space="preserve">
           <source>Please add auth config</source>
@@ -390,6 +390,22 @@
           <source>Unregistered</source>
           <target state="new">Unregistered</target>
         </trans-unit>
+        <trans-unit id="code327" translate="yes" xml:space="preserve">
+          <source>Spaces are not allowed in password</source>
+          <target state="new">Spaces are not allowed in password</target>
+        </trans-unit>
+        <trans-unit id="codehad" translate="yes" xml:space="preserve">
+          <source>Enter an existing verification code</source>
+          <target state="new">Enter an existing verification code</target>
+        </trans-unit>
+        <trans-unit id="Text_useroutok" translate="yes" xml:space="preserve">
+          <source>Cancellation Submitted</source>
+          <target state="new">Cancellation Submitted</target>
+        </trans-unit>
+        <trans-unit id="Text_useroutoktext" translate="yes" xml:space="preserve">
+          <source>Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</source>
+          <target state="new">Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -215,8 +215,8 @@
           <target state="new">Register error!</target>
         </trans-unit>
         <trans-unit id="code311" translate="yes" xml:space="preserve">
-          <source>The password is incorrect, please re-enter it</source>
-          <target state="new">The password is incorrect, please re-enter it</target>
+          <source>Wrong password. You can check whether the letter is uppercase or lowercase.</source>
+          <target state="new">Wrong password. You can check whether the letter is uppercase or lowercase.</target>
         </trans-unit>
         <trans-unit id="code312" translate="yes" xml:space="preserve">
           <source>Incorrect code</source>
@@ -255,12 +255,12 @@
           <target state="new">Passwords are different. Please re-enter them.</target>
         </trans-unit>
         <trans-unit id="code321" translate="yes" xml:space="preserve">
-          <source>At least 6 characters</source>
-          <target state="new">At least 6 characters</target>
+          <source>Password must be 6-24 characters</source>
+          <target state="new">Password must be 6-24 characters</target>
         </trans-unit>
         <trans-unit id="code322" translate="yes" xml:space="preserve">
-          <source>Up to 24 characters</source>
-          <target state="new">Up to 24 characters</target>
+          <source>Password must be 6-24 characters</source>
+          <target state="new">Password must be 6-24 characters</target>
         </trans-unit>
         <trans-unit id="code323" translate="yes" xml:space="preserve">
           <source>Please add auth config</source>
@@ -390,6 +390,22 @@
           <source>Unregistered</source>
           <target state="new">Unregistered</target>
         </trans-unit>
+        <trans-unit id="code327" translate="yes" xml:space="preserve">
+          <source>Spaces are not allowed in password</source>
+          <target state="new">Spaces are not allowed in password</target>
+        </trans-unit>
+        <trans-unit id="codehad" translate="yes" xml:space="preserve">
+          <source>Enter an existing verification code</source>
+          <target state="new">Enter an existing verification code</target>
+        </trans-unit>
+        <trans-unit id="Text_useroutok" translate="yes" xml:space="preserve">
+          <source>Cancellation Submitted</source>
+          <target state="new">Cancellation Submitted</target>
+        </trans-unit>
+        <trans-unit id="Text_useroutoktext" translate="yes" xml:space="preserve">
+          <source>Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</source>
+          <target state="new">Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/PDF Master.csproj

@@ -524,6 +524,7 @@
     <Compile Include="ViewModels\Dialog\ServiceDialog\UserDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ServiceDialog\UserOutCodeRegionViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ServiceDialog\UserOutingLoginViewModel.cs" />
+    <Compile Include="ViewModels\Dialog\ServiceDialog\UserOutOKRegionViewModel.cs" />
     <Compile Include="ViewModels\Dialog\SettingsDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ToolsDialogs\MergeDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\HomePageToolsDialogs\HomePageBatchProcessing\HomePageRemoveDialogViewModel.cs" />
@@ -943,6 +944,9 @@
     <Compile Include="Views\Dialog\ServiceDialog\UserOutingLogin.xaml.cs">
       <DependentUpon>UserOutingLogin.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Dialog\ServiceDialog\UserOutOKRegion.xaml.cs">
+      <DependentUpon>UserOutOKRegion.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Dialog\SettingsDialog.xaml.cs">
       <DependentUpon>SettingsDialog.xaml</DependentUpon>
     </Compile>
@@ -1737,6 +1741,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Dialog\ServiceDialog\UserOutOKRegion.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Dialog\SettingsDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

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

@@ -151,7 +151,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 The password is incorrect, please re-enter it 的本地化字符串。
+        ///   查找类似 Wrong password. You can check whether the letter is uppercase or lowercase. 的本地化字符串。
         /// </summary>
         public static string code311 {
             get {
@@ -241,7 +241,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 At least 6 characters 的本地化字符串。
+        ///   查找类似 Password must be 6-24 characters 的本地化字符串。
         /// </summary>
         public static string code321 {
             get {
@@ -250,7 +250,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Up to 24 characters 的本地化字符串。
+        ///   查找类似 Password must be 6-24 characters 的本地化字符串。
         /// </summary>
         public static string code322 {
             get {
@@ -294,6 +294,24 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Spaces are not allowed in password 的本地化字符串。
+        /// </summary>
+        public static string code327 {
+            get {
+                return ResourceManager.GetString("code327", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Enter an existing verification code 的本地化字符串。
+        /// </summary>
+        public static string codehad {
+            get {
+                return ResourceManager.GetString("codehad", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Up to 24 characters 的本地化字符串。
         /// </summary>
@@ -897,6 +915,24 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Cancellation Submitted 的本地化字符串。
+        /// </summary>
+        public static string Text_useroutok {
+            get {
+                return ResourceManager.GetString("Text_useroutok", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again 的本地化字符串。
+        /// </summary>
+        public static string Text_useroutoktext {
+            get {
+                return ResourceManager.GetString("Text_useroutoktext", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Are you sure you want to cancel your account? 的本地化字符串。
         /// </summary>

PDF Office/Strings/Service/Service.resx

@@ -148,7 +148,7 @@
     <value>Register error!</value>
   </data>
   <data name="code311" xml:space="preserve">
-    <value>The password is incorrect, please re-enter it</value>
+    <value>Wrong password. You can check whether the letter is uppercase or lowercase.</value>
   </data>
   <data name="code312" xml:space="preserve">
     <value>Incorrect code</value>
@@ -178,10 +178,10 @@
     <value>Passwords are different. Please re-enter them.</value>
   </data>
   <data name="code321" xml:space="preserve">
-    <value>At least 6 characters</value>
+    <value>Password must be 6-24 characters</value>
   </data>
   <data name="code322" xml:space="preserve">
-    <value>Up to 24 characters</value>
+    <value>Password must be 6-24 characters</value>
   </data>
   <data name="code323" xml:space="preserve">
     <value>Please add auth config</value>
@@ -195,6 +195,12 @@
   <data name="code326" xml:space="preserve">
     <value>Time transfer error</value>
   </data>
+  <data name="code327" xml:space="preserve">
+    <value>Spaces are not allowed in password</value>
+  </data>
+  <data name="codehad" xml:space="preserve">
+    <value>Enter an existing verification code</value>
+  </data>
   <data name="Codemax" xml:space="preserve">
     <value>Up to 24 characters</value>
   </data>
@@ -396,6 +402,12 @@
   <data name="Text_useroutmsg" xml:space="preserve">
     <value>Cancellation cannot be withdrawn, it will be completed within 3 working days, until then your account will be frozen and cannot be logged in, are you sure you want to delete your account?</value>
   </data>
+  <data name="Text_useroutok" xml:space="preserve">
+    <value>Cancellation Submitted</value>
+  </data>
+  <data name="Text_useroutoktext" xml:space="preserve">
+    <value>Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again</value>
+  </data>
   <data name="Text_userouttol" xml:space="preserve">
     <value>Are you sure you want to cancel your account?</value>
   </data>

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

@@ -254,7 +254,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                     Codeagin = Visibility.Visible;
                     Codetime = " ";
                     disTimer.Stop();
-                    RegisterCodemsg = "请输入已有的验证码";
+                    RegisterCodemsg = ErrorCodeHelper.Ercode("codehad");
                     RegisterCodemsgVis = Visibility.Visible;
 
                 }
@@ -276,7 +276,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                     Codeagin = Visibility.Visible;
                     Codetime = " ";
                     disTimer.Stop();
-                    RegisterCodemsg = "请输入已有的验证码";
+                    RegisterCodemsg =  ErrorCodeHelper.Ercode("codehad");
                     RegisterCodemsgVis = Visibility.Visible;
 
                 }

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

@@ -105,7 +105,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         
 
-        private string _Containspaces = "密码不能包含空格";
+        private string _Containspaces = "";
         public string Containspaces
         {
             get { return _Containspaces; }
@@ -139,6 +139,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             Codemax = App.ServiceLoader.GetString("Codemax");
             Codemin = App.ServiceLoader.GetString("Codemin");
+            Containspaces = App.ServiceLoader.GetString("code327");
             Text_Login = App.ServiceLoader.GetString("Text_Login");
             Text_chmail = App.ServiceLoader.GetString("Text_chmail");
             Text_enterpass = App.ServiceLoader.GetString("RegisterPasswordMsg");

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

@@ -88,6 +88,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             Codemax = App.ServiceLoader.GetString("Codemax");
             Codemin = App.ServiceLoader.GetString("Codemin");
+            Containspaces = App.ServiceLoader.GetString("code327");
             Text_passuodata = App.ServiceLoader.GetString("Text_toocode");
             LoginPasswordMsg = App.ServiceLoader.GetString("LoginPasswordMsg");
             LoginPasswordMsg2 = App.ServiceLoader.GetString("LoginPasswordMsg2");
@@ -259,7 +260,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private string _Containspaces = "密码不能包含空格";
+        private string _Containspaces = "";
         public string Containspaces
         {
             get { return _Containspaces; }
@@ -395,7 +396,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 EnableNextStep = false;
             }
 
-            if (LoginPassword != LoginPassword2)
+            if (LoginPassword != LoginPassword2&&LoginPassword!=""&& LoginPassword2 != "")
             {
                 PasswordUpdatalookVis = Visibility.Visible;
                 PasswordUpdatamsglook = ErrorCodeHelper.Ercode("320");
@@ -403,7 +404,6 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             else
             {
                 PasswordUpdatalookVis = Visibility.Collapsed;
-
             }
         }
 

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

@@ -146,7 +146,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private string _Containspaces = "密码不能包含空格";
+        private string _Containspaces = "";
         public string Containspaces
         {
             get { return _Containspaces; }
@@ -191,6 +191,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void InitString()
         {
             ErrorCodeHelper.InitString();
+            Containspaces = App.ServiceLoader.GetString("code327");
             Text_Signup = App.ServiceLoader.GetString("Text_Signup");
             Registertext1 = App.ServiceLoader.GetString("Registertext1");
             RegisterEmailMsg = App.ServiceLoader.GetString("RegisterEmailMsg");

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

@@ -253,7 +253,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 Codeagin = Visibility.Visible;
                 Codetime = " ";
                 disTimer.Stop();
-                UserCodemsg = "请输入已有的验证码";
+                UserCodemsg = ErrorCodeHelper.Ercode("codehad");
                 UserCodemsgVis = Visibility.Visible;
             }
             else if (code == "200")
@@ -290,7 +290,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                     App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                     App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                     App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    UserDialogViewModel.Close();
+                    UserDialogViewModel.RegionMan("UserOutOKRegion");
+                    
+                    
                 }
                 else
                 {
@@ -365,7 +367,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 Codeagin = Visibility.Visible;
                 Codetime = " ";
                 disTimer.Stop();
-                UserCodemsg = "请输入已有的验证码";
+                UserCodemsg = ErrorCodeHelper.Ercode("codehad");
                 UserCodemsgVis = Visibility.Visible;
             }
             else if (code == "200")

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

@@ -0,0 +1,109 @@
+using PDF_Master.Helper;
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace PDF_Master.ViewModels.Dialog.ServiceDialog
+{
+    public class UserOutOKRegionViewModel : BindableBase, INavigationAware
+    {
+       
+        private UserDialogViewModel UserDialogViewModel;
+        public IDialogService dialogs;
+
+
+        #region 文案
+        
+        private string _Text_useroutok = "";
+
+        public string Text_useroutok
+        {
+            get { return _Text_useroutok; }
+            set
+            {
+                SetProperty(ref _Text_useroutok, value);
+            }
+        }
+
+        private string _Text_useroutoktext = "";
+
+        public string Text_useroutoktext
+        {
+            get { return _Text_useroutoktext; }
+            set
+            {
+                SetProperty(ref _Text_useroutoktext, value);
+            }
+        }
+
+
+
+        private string _Text_ok = "";
+
+        public string Text_ok
+        {
+            get { return _Text_ok; }
+            set
+            {
+                SetProperty(ref _Text_ok, value);
+            }
+        }
+
+        private void InitString()
+        {
+
+            Text_useroutok = App.ServiceLoader.GetString("Text_useroutok");
+            Text_useroutoktext = App.ServiceLoader.GetString("Text_useroutoktext");
+            Text_ok = App.ServiceLoader.GetString("Text_ok");
+
+        }
+
+
+        #endregion
+
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+
+
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            navigationContext.Parameters.TryGetValue<UserDialogViewModel>("UserDialogViewModel", out UserDialogViewModel);
+        }
+
+        public DelegateCommand UserGetokCommand { get; set; }
+
+        public UserOutOKRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
+        {
+
+
+
+            dialogs = dialogService;
+            UserGetokCommand = new DelegateCommand(UserGetok);
+            InitString();
+        }
+
+        private void UserGetok()
+        {
+
+            UserDialogViewModel.Close();
+
+
+        }
+    }
+}

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -856,9 +856,8 @@ namespace PDF_Master.ViewModels.PageEdit
         {
             ZoomIndex--;
             ChangeItemSize(ItemSizes[ZoomIndex + 1]);
-           
-
-
+            PageEditContent pageEditContent = new PageEditContent();
+            pageEditContent.PulishEvent();
 
 
         }

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

@@ -69,7 +69,7 @@
                             <TextBlock
                         VerticalAlignment="Center"
                         HorizontalAlignment="Center"
-                    
+                      FontFamily="SF Pro Text"
                         FontSize="28"                             
                         FontWeight="SemiBold"
                         Foreground="White"
@@ -87,14 +87,14 @@
                             Text="{Binding Text_admail}" />
                         <TextBlock
                             Width="172"
-                            Height="22"
+                          
                             Margin="0,10,0,0"
                             HorizontalAlignment="Center"
                             FontFamily="Segoe UI"
                             FontSize="14"
                             FontStyle="Normal"
                             Foreground="#252629"
-                            LineHeight="20"
+          
                             Text="{Binding UserEmail}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />

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

@@ -245,7 +245,7 @@
                     Content="{Binding Text_Cancellatio}"
                     IsDefault="True"
                     IsEnabled="{Binding EnableNextStep, Mode=TwoWay}"
-                    Style="{StaticResource btn.brand}" />
+                      Style="{StaticResource Btn.cta}" />
                 <Button
                     Width="200"
                     Height="32"

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

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Prism.Ioc;
+using Prism.Regions;
+
+namespace PDF_Master.Views.Dialog.ServiceDialog
+{
+    /// <summary>
+    /// RegisterOKRegion.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserOutOKRegion : UserControl
+    {
+        public UserOutOKRegion()
+        {
+            InitializeComponent();
+        }
+    }
+}

PDF Office/Views/HomePanel/PromotionContent.xaml

@@ -138,7 +138,7 @@
                 Margin="0,24"
                 VerticalAlignment="Bottom"
                 PreviewMouseLeftButtonDown="ImgeActivity_PreviewMouseLeftButtonDown"
-                Source="C:\\Users\\kdan\\Documents\\PDF Master\\ADTemp\\1.png" />
+                 />
         </Grid>
     </ScrollViewer>
 </UserControl>

PDF Office/Views/HomePanel/PromotionContent.xaml.cs

@@ -56,8 +56,11 @@ namespace PDF_Master.Views.HomePanel
             InitPromotionBanner();
             //LoadPromotionContents();
             ADDispaly();
+            string path = App.CachePath.ADFilePath;
+            string FileName = path + "\\" + 1 + ".png";
+            ImgeActivity.Source =new BitmapImage(new Uri(  path + "\\" + 1 + ".png"));
+
 
-         
         }
 
         private void InitPromotionBanner()

PDF Office/Views/MainWindow.xaml

@@ -360,6 +360,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="14"
+                            FontFamily="SF Pro Text"
                             FontWeight="SemiBold"
                             Foreground="White"
                             Text="{Binding Useremailchar}" />

PDF Office/Views/PageEdit/PageEditContent.xaml

@@ -352,7 +352,6 @@
                 BorderThickness="0"
                 Drop="ListPageEdit_Drop"
                 FocusVisualStyle="{x:Null}"
-                LayoutUpdated="OnLayoutUpdated"
                 ItemTemplate="{StaticResource PageEditListBoxItemTemplate}"
                 ItemsSource="{Binding PageEditItems}"
                 PreviewMouseLeftButtonDown="ListPageEdit_PreviewMouseLeftButtonDown"

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

@@ -191,49 +191,6 @@ namespace PDF_Master.Views.PageEdit
         }
 
        
-        /// <summary>
-        /// 初始化listbox滚动条范围
-        /// </summary>
-        private double _scrollbarMaximum = -1;
-        /// <summary>
-        /// 查找组成控件
-        /// </summary>
-        /// <param name="element"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        private DependencyObject GetDescendantByType(DependencyObject element, Type type)
-        {
-            if (element.GetType() == type) return element;
-            DependencyObject foundElement = null;
-            int childrenCount = VisualTreeHelper.GetChildrenCount(element);
-            for (int i = 0; i < childrenCount; i++)
-            {
-                var child = VisualTreeHelper.GetChild(element, i);
-                if (child.GetType() == type)
-                {
-                    foundElement = child;
-                    break;
-                }
-                foundElement = GetDescendantByType(child, type);
-                if (foundElement != null)
-                    break;
-            }
-            return foundElement;
-        }
-        /// <summary>
-        /// 滚动条范围发生变化触发事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnLayoutUpdated(object sender, EventArgs e)
-        {
-            var scrollViewer = GetDescendantByType(ListPageEdit, typeof(ScrollViewer)) as ScrollViewer;
-            if (scrollViewer != null && scrollViewer.ScrollableHeight != _scrollbarMaximum)
-            {
-                PulishEvent();
-                _scrollbarMaximum = scrollViewer.ScrollableHeight;
-            }
-        }