轻会员-账号下线弹窗和部分逻辑补充和部分弹窗高保真

PDF Office/App.xaml.cs

@@ -662,7 +662,8 @@ namespace PDF_Master
             containerRegistry.RegisterDialog<UserOutingLogin>(DialogNames.UserOutingLogin);
             containerRegistry.RegisterDialog<RegisterOKRegion>(DialogNames.RegisterOKRegion);
             containerRegistry.RegisterDialog<SubscriptionDialog>(DialogNames.SubscriptionDialog);
-            containerRegistry.RegisterDialog<SubscriptionOKDialog>(DialogNames.SubscriptionOKDialog);
+            containerRegistry.RegisterDialog<SubscriptionOKDialog>(DialogNames.SubscriptionOKDialog);
+            containerRegistry.RegisterDialog<LoginoffDialog>(DialogNames.LoginoffDialog);
 
 
             //新手引导弹窗

PDF Office/Model/DialogNames.cs

@@ -17,7 +17,10 @@ namespace PDF_Master.Model
         /// </summary>
         public static string AboutDialog = "AboutDialog";
 
-
+        /// <summary>
+        /// 账号强制下线弹窗
+        /// </summary>
+        public static string LoginoffDialog = "LoginoffDialog";
 
         /// <summary>
         /// 订阅权益弹窗

PDF Office/PDF Master.csproj

@@ -518,6 +518,7 @@
       <DependentUpon>Service.resx</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\Dialog\ChatGPTAIDialogs\DocumentaryTranslationDialogViewModel.cs" />
+    <Compile Include="ViewModels\Dialog\ServiceDialog\LoginoffViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ServiceDialog\SubscriptionDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ServiceDialog\SubscriptionOKDialogViewModel.cs" />
     <Compile Include="ViewModels\HomePanel\PDFTools\HomeFilesContentViewModel.cs" />
@@ -945,6 +946,9 @@
     <Compile Include="Views\Dialog\ServiceDialog\LoginDialog.xaml.cs">
       <DependentUpon>LoginDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Dialog\ServiceDialog\LoginoffDialog.xaml.cs">
+      <DependentUpon>LoginoffDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Dialog\ServiceDialog\LoginPasswordRegion.xaml.cs">
       <DependentUpon>LoginPasswordRegion.xaml</DependentUpon>
     </Compile>
@@ -1765,6 +1769,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Dialog\ServiceDialog\LoginoffDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Dialog\ServiceDialog\LoginPasswordRegion.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

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

@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using PDF_Master.Helper;
+using PDF_Master.Model;
 using PDF_Master.Properties;
 using Prism.Commands;
 using Prism.Mvvm;
@@ -15,6 +16,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 {
      public class LoginDialogViewModel : BindableBase, IDialogAware
     {
+        public IDialogService dialogs;
         public IRegionManager Region;
         public string Title => "登录窗口";
 
@@ -75,13 +77,19 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             else { RegionMan("LoginRegion"); }
         }
 
-
+        public DelegateCommand OpenIAPCommand { get; set; }
         LoginDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
+            OpenIAPCommand = new DelegateCommand(OpenIAP);
+            dialogs = dialogService;
             this.Region = regionManager;
             LoginRegionName = Guid.NewGuid().ToString();
         }
+        private void OpenIAP()
+        {
+            dialogs.ShowDialog(DialogNames.IAPCompareDialog);
 
+        }
         public void Close()
         {
            

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

@@ -120,6 +120,52 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 SetProperty(ref _Mailerr, value);
             }
         }
+
+        private string _Text_remsg = "";
+        public string Text_remsg
+        {
+            get { return _Text_remsg; }
+            set
+            {
+                SetProperty(ref _Text_remsg, value);
+
+            }
+        }
+
+
+
+        private string _Text_privary = "";
+        public string Text_privary
+        {
+            get { return _Text_privary; }
+            set
+            {
+                SetProperty(ref _Text_privary, value);
+
+            }
+        }
+
+        private string _Text_and = "";
+        public string Text_and
+        {
+            get { return _Text_and; }
+            set
+            {
+                SetProperty(ref _Text_and, value);
+            }
+        }
+
+        private string _Text_licens = "";
+        public string Text_licens
+        {
+            get { return _Text_licens; }
+            set
+            {
+                SetProperty(ref _Text_licens, value);
+            }
+        }
+
+
         private void InitString()
         {
 
@@ -130,6 +176,10 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             Text_toregister = App.ServiceLoader.GetString("Text_Signup");
             Mailerr = App.ServiceLoader.GetString("Mailerr");
             LoginEmailMsg = App.ServiceLoader.GetString("RegisterEmailMsg");
+            Text_remsg = App.ServiceLoader.GetString("Text_remsg");
+            Text_privary = App.ServiceLoader.GetString("Text_privary");
+            Text_and = App.ServiceLoader.GetString("Text_and");
+            Text_licens = App.ServiceLoader.GetString("Text_licens");
         }
 
 

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

@@ -0,0 +1,80 @@
+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;
+
+namespace PDF_Master.ViewModels.Dialog.ServiceDialog
+{
+    public class LoginoffDialogViewModel : BindableBase, IDialogAware
+    {
+
+
+
+        public string Title => "";
+
+        public event Action<IDialogResult> RequestClose;
+
+        #region 文案
+
+
+
+        #endregion
+
+
+
+        private void InitString()
+        {
+
+            //Text_Signup = App.ServiceLoader.GetString("Text_Signup");
+
+        }
+
+
+
+
+
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+
+        }
+
+
+        public DelegateCommand GoLoginCommand { get; set; }
+        public LoginoffDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
+        {
+
+            GoLoginCommand = new DelegateCommand(GoLogin);
+            InitString();
+
+        }
+
+        public void Close()
+        {
+
+            RequestClose?.Invoke(new Prism.Services.Dialogs.DialogResult(ButtonResult.Cancel));
+        }
+        private void GoLogin()
+        {
+            Close();
+            App.mainWindowViewModel.OpenLogin();
+        
+        }
+
+    }
+}

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

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using PDF_Master.Helper;
+using PDF_Master.Model;
 using PDF_Master.Properties;
 using PDF_Master.Views.Dialog.ServiceDialog;
 using Prism.Commands;
@@ -15,7 +16,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 {
     public class RegisterDialogViewModel : BindableBase, IDialogAware
     {
-
+        public IDialogService dialogs;
         public  IRegionManager Region;
         public string Title => "注册窗口";
 
@@ -75,13 +76,21 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
            
         }
 
+
+        public DelegateCommand OpenIAPCommand { get; set; }
         RegisterDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
+            OpenIAPCommand = new DelegateCommand(OpenIAP);
+            dialogs = dialogService;
             this.Region = regionManager;
             RegisterRegionName = Guid.NewGuid().ToString();
         }
 
+        private void OpenIAP()
+        {
+            dialogs.ShowDialog(DialogNames.IAPCompareDialog);
 
+        }
 
         public void RegionMan(string name)
         {

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

@@ -1,4 +1,5 @@
 using PDF_Master.Helper;
+using PDF_Master.Model;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -55,19 +56,27 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
 
 
-        public DelegateCommand RegisterGetStartCommand { get; set; }
+        public DelegateCommand OpenIAPCommand { get; set; }
+
 
         public string Title => throw new NotImplementedException();
 
         public RegisterOKRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
-
-
-        
+            OpenIAPCommand = new DelegateCommand(OpenIAP);
             dialogs = dialogService;
             InitString();
         }
 
+        private void OpenIAP()
+        {
+            Close();
+            dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+
+        }
+
+
+
         public void Close()
         {
             RequestClose?.Invoke(new Prism.Services.Dialogs.DialogResult(ButtonResult.Cancel));

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

@@ -42,9 +42,17 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void InitString()
         {
 
-            LinkstoreCommand = new DelegateCommand(Linkstore);
+           
         }
 
+
+        public SubscriptionDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
+        {
+
+            LinkstoreCommand = new DelegateCommand(Linkstore);
+            InitString();
+
+        }
         private void Linkstore()
         {
 
@@ -73,15 +81,6 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         }
 
 
-
-        public SubscriptionDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
-        {
-
-            //GoLoginCommand = new DelegateCommand(GoLogin);
-            InitString();
-
-        }
-
     }
 }
 

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -424,7 +424,10 @@ namespace PDF_Master.ViewModels
             dialogs.ShowDialog(DialogNames.RegisterOKRegion);
         }
 
-
+        public void OpenLoginoff()
+        {
+            dialogs.ShowDialog(DialogNames.LoginoffDialog);
+        }
 
         //打开用户弹窗
         public void OpenUser()
@@ -438,7 +441,7 @@ namespace PDF_Master.ViewModels
                     UserVis = Visibility.Collapsed;
                     LoginVis = Visibility.Visible;
                     OphVis = Visibility.Visible;
-                    OpenLogin();
+                    OpenLoginoff();
 
 
                 }

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

@@ -6,15 +6,15 @@
     xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
-    prism:ViewModelLocator.AutoWireViewModel="True" 
     Width="664"
-     prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
     Height="420"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <Grid Background="White">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="260"/>
-            <ColumnDefinition/>
+            <ColumnDefinition Width="260" />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <Grid>
             <Grid.Background>
@@ -26,8 +26,8 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top">
                 <TextBlock
-                    HorizontalAlignment="Left"
                     Width="169"
+                    HorizontalAlignment="Left"
                     FontFamily="Segoe UI"
                     FontSize="20"
                     FontWeight="SemiBold"
@@ -37,8 +37,8 @@
                 <TextBlock
                     Width="204"
                     Height="32"
-                    HorizontalAlignment="Left"
                     Margin="0,2,0,0"
+                    HorizontalAlignment="Left"
                     FontFamily="SF Pro Text"
                     FontSize="10"
                     Foreground="#94989C"
@@ -47,53 +47,158 @@
                     TextWrapping="Wrap" />
             </StackPanel>
 
-            <StackPanel Margin="28,152,0,0"  HorizontalAlignment="Left"  Height="204" VerticalAlignment="Top">
-                <Grid  Height="42" HorizontalAlignment="Left">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png"/>
+            <StackPanel
+                Height="204"
+                Margin="28,152,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top">
+                <Grid Height="42" HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png" />
                     </Border>
-                    <StackPanel Width="129" Height="42" Margin="42,0,0,0">
-                        <TextBlock Text="Edit PDF" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                        <TextBlock Margin="0,4,0,0" Text="Text editing, image editing"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                    <StackPanel
+                        Width="129"
+                        Height="42"
+                        Margin="42,0,0,0">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="Edit PDF" />
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="Text editing, image editing" />
                     </StackPanel>
                 </Grid>
-                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png"/>
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png" />
                     </Border>
-                    <StackPanel Margin="42,0,0,0"  Height="42" >
+                    <StackPanel Height="42" Margin="42,0,0,0">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="Convert" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                            <TextBlock Text="(Limit first 10 pages)" FontFamily="Segoe UI"  FontSize="11" LineHeight="18" Height="18" Margin="8,0,0,0" Foreground="#94989C"/>
+                            <TextBlock
+                                Height="20"
+                                FontFamily="Segoe UI"
+                                FontSize="12"
+                                FontWeight="SemiBold"
+                                LineHeight="20"
+                                Text="Convert" />
+                            <TextBlock
+                                Height="18"
+                                Margin="8,0,0,0"
+                                FontFamily="Segoe UI"
+                                FontSize="11"
+                                Foreground="#94989C"
+                                LineHeight="18"
+                                Text="(Limit first 10 pages)" />
                         </StackPanel>
 
-                        <TextBlock Margin="0,4,0,0" Text="Best PDF to Office Converter"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="Best PDF to Office Converter" />
                     </StackPanel>
                 </Grid>
-                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png"/>
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png" />
                     </Border>
-                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0">
-                        <TextBlock Text="Page Edit" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                        <TextBlock Margin="0,4,0,0" Text="Insert, Replace, Split, Extract"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                    <StackPanel
+                        Height="42"
+                        Margin="42,0,0,0"
+                        HorizontalAlignment="Left">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="Page Edit" />
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="Insert, Replace, Split, Extract" />
                     </StackPanel>
                 </Grid>
-                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png"/>
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png" />
                     </Border>
-                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0" >
-                        <TextBlock Text="More Features" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                        <TextBlock Margin="0,4,0,0" Text="More features to look forward"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                    <StackPanel
+                        Height="42"
+                        Margin="42,0,0,0"
+                        HorizontalAlignment="Left">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="More Features" />
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="More features to look forward" />
                     </StackPanel>
                 </Grid>
             </StackPanel>
             <!--<TextBlock Text="Subscribe Now" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" Foreground="#3F8FF6"  LineHeight="20" Margin="150,380,0,0" Width="82" Height="20" />-->
-            <Button Content="Subscribe Now" Background="Transparent"  Margin="150,380,0,0" Width="84" Height="20" Foreground="#3F8FF6" FontWeight="SemiBold" FontSize="12" FontFamily="Segoe UI" BorderThickness="0" />
+            <TextBlock
+                Width="84"
+                Height="20"
+                Margin="150,380,0,0"
+                Background="Transparent"
+                FontFamily="Segoe UI"
+                FontSize="12"
+                FontWeight="SemiBold"
+                Foreground="#3F8FF6">
+                <Hyperlink Command="{Binding OpenIAPCommand}">
+                    <TextBlock Text="Subscribe Now" />
+                </Hyperlink>
+            </TextBlock>
         </Grid>
-        <Grid Grid.Column="1" >
-            <ContentControl prism:RegionManager.RegionName="{Binding LoginRegionName}" Visibility="Visible"/>
+        <Grid Grid.Column="1">
+            <ContentControl prism:RegionManager.RegionName="{Binding LoginRegionName}" Visibility="Visible" />
         </Grid>
     </Grid>
 </UserControl>

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

@@ -9,7 +9,7 @@
     xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
-    Width="326"
+    Width="404"
     Height="420"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
@@ -305,7 +305,7 @@
                 Fill="Black" />
         </Button>
         <Grid
-            Width="262"
+            Width="304"
             Margin="0,48,0,0"
             HorizontalAlignment="Center"
             VerticalAlignment="Top">
@@ -356,7 +356,7 @@
                     Text="{Binding Text_enterpass}" />
                 <Grid Margin="0,8,0,0">
                     <Grid
-                        Width="262"
+                        Width="304"
                         Height="32"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top">
@@ -375,7 +375,7 @@
                             Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
                         <TextBox
                             Grid.ColumnSpan="2"
-                            Width="262"
+                            Width="304"
                             HorizontalAlignment="Left"
                             help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg0, Mode=TwoWay}"
                             InputMethod.IsInputMethodEnabled="False"
@@ -411,7 +411,7 @@
 
                 <TextBlock
                     x:Name="Textbl_password"
-                    Width="262"
+                    Width="304"
                     Height="20"
                     Margin="0,2,0,0"
                     HorizontalAlignment="Center"
@@ -419,7 +419,7 @@
                     Text="{Binding LoginPasswordlook, Mode=TwoWay}" />
 
                 <Button
-                    Width="262"
+                    Width="304"
                     Height="32"
                     Margin="0,8,0,0"
                     HorizontalAlignment="Left"
@@ -446,7 +446,7 @@
         </Grid>
         <Grid
             x:Name="Grid_msg"
-            Width="326"
+            Width="404"
             Height="48"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"

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

@@ -8,7 +8,7 @@
     xmlns:convert="clr-namespace:PDF_Master.DataConvert"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
-    Width="326"
+    Width="404"
     Height="420"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
@@ -323,7 +323,7 @@
                         FontStyle="Normal"
                         Text="{Binding Text_emailac}" />
                     <Grid
-                        Width="262"
+                        Width="304"
                         Height="32"
                         Margin="0,8,0,0"
                         HorizontalAlignment="Left">
@@ -343,14 +343,14 @@
                     </Grid>
                     <TextBlock
                         x:Name="Textbl_email"
-                        Width="262"
+                        Width="304"
                         Height="Auto"
                         Margin="0,2,0,0"
                         HorizontalAlignment="Left"
                         Foreground="#F3465B"
                         Text="{Binding LoginEmaillook, Mode=TwoWay}" TextWrapping="Wrap" />
                     <Button
-                        Width="262"
+                        Width="304"
                         Height="32"
                         Margin="0,48,0,0"
                         HorizontalAlignment="Center"
@@ -389,6 +389,35 @@
                         </TextBlock>
 
                     </WrapPanel>
+                    <TextBlock
+                    Width="304"
+                    Height="36"
+                    Margin="0,28,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    FontFamily="Segoe UI"
+                    FontSize="11"
+                    FontWeight="Normal"
+                    Foreground="#616469"
+                    LineHeight="18"
+                    TextWrapping="Wrap">
+                    <Run Text="{Binding Text_remsg}" />
+                    <Hyperlink
+                        Command="{Binding LinkPolicyCommand}"
+                        NavigateUri="{Binding UriPolivy}"
+                        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}" />
+                    </Hyperlink>
+                </TextBlock>
                 </StackPanel>
             </Grid>
 

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

@@ -0,0 +1,74 @@
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.ServiceDialog.LoginoffDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="392"
+    Height="209"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    mc:Ignorable="d">
+    <Grid Background="White">
+        <Grid>
+            <StackPanel>
+                <WrapPanel Margin="18,18,0,0" HorizontalAlignment="Left">
+                    <Border
+                        Width="20"
+                        Height="20"
+                        Background="#FFAF25"
+                        CornerRadius="100">
+                        <Path
+                            Margin="-2,-2,0,0"
+                            Data="M11 5.33301V13.9997H13V5.33301H11ZM11 15.9997V18.6663H13V15.9997H11Z"
+                            Fill="White" />
+                    </Border>
+                    <TextBlock
+                        Margin="10,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="16"
+                        FontWeight="SemiBold"
+                        LineHeight="24"
+                        Text="Please login again" />
+                </WrapPanel>
+                <TextBlock
+                    Width="392"
+                    Margin="0,16,0,0"
+                    HorizontalAlignment="Left"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    LineHeight="22"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap">
+                    <Run Text="您的账号已在其他设备登录，若非本人操作,请尽快" />
+                    <Hyperlink  Command="{Binding GOLoginCommand}">
+                        <TextBlock Margin="0,16,0,0" Text="修改您的账号密码" />
+                    </Hyperlink>
+                </TextBlock>
+                <WrapPanel Margin="0,32,0,0">
+                    <Button
+                        Width="80"
+                        Height="32"
+                        Margin="200,0,0,0"
+                        HorizontalAlignment="Left"
+                        Content="取消"
+                        IsCancel="True"
+                        IsDefault="True"
+                        Style="{StaticResource btn.sec}" />
+                    <Button
+                        Width="80"
+                        Height="32"
+                        Margin="20,0,0,0"
+                        HorizontalAlignment="Left"
+                        Content="{Binding Text_ok}"
+                        IsCancel="True"
+                        IsDefault="True"
+                        Style="{StaticResource Btn.cta}" />
+                </WrapPanel>
+
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>

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

@@ -0,0 +1,28 @@
+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;
+
+namespace PDF_Master.Views.Dialog.ServiceDialog
+{
+    /// <summary>
+    /// LoginoffDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class LoginoffDialog : UserControl
+    {
+        public LoginoffDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -26,8 +26,8 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top">
                 <TextBlock
-                    HorizontalAlignment="Left"
                     Width="169"
+                    HorizontalAlignment="Left"
                     FontFamily="Segoe UI"
                     FontSize="20"
                     FontWeight="SemiBold"
@@ -37,8 +37,8 @@
                 <TextBlock
                     Width="204"
                     Height="32"
-                    HorizontalAlignment="Left"
                     Margin="0,2,0,0"
+                    HorizontalAlignment="Left"
                     FontFamily="SF Pro Text"
                     FontSize="10"
                     Foreground="#94989C"
@@ -47,51 +47,156 @@
                     TextWrapping="Wrap" />
             </StackPanel>
 
-            <StackPanel Margin="28,152,0,0"  HorizontalAlignment="Left"  Height="204" VerticalAlignment="Top">
-                <Grid  Height="42" HorizontalAlignment="Left">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png"/>
+            <StackPanel
+                Height="204"
+                Margin="28,152,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top">
+                <Grid Height="42" HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png" />
                     </Border>
-                    <StackPanel Width="129" Height="42" Margin="42,0,0,0">
-                        <TextBlock Text="Edit PDF" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                        <TextBlock Margin="0,4,0,0" Text="Text editing, image editing"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                    <StackPanel
+                        Width="129"
+                        Height="42"
+                        Margin="42,0,0,0">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="Edit PDF" />
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="Text editing, image editing" />
                     </StackPanel>
                 </Grid>
-                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png"/>
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png" />
                     </Border>
-                    <StackPanel Margin="42,0,0,0"  Height="42" >
+                    <StackPanel Height="42" Margin="42,0,0,0">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="Convert" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                            <TextBlock Text="(Limit first 10 pages)" FontFamily="Segoe UI"  FontSize="11" LineHeight="18" Height="18" Margin="8,0,0,0" Foreground="#94989C"/>
+                            <TextBlock
+                                Height="20"
+                                FontFamily="Segoe UI"
+                                FontSize="12"
+                                FontWeight="SemiBold"
+                                LineHeight="20"
+                                Text="Convert" />
+                            <TextBlock
+                                Height="18"
+                                Margin="8,0,0,0"
+                                FontFamily="Segoe UI"
+                                FontSize="11"
+                                Foreground="#94989C"
+                                LineHeight="18"
+                                Text="(Limit first 10 pages)" />
                         </StackPanel>
 
-                        <TextBlock Margin="0,4,0,0" Text="Best PDF to Office Converter"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="Best PDF to Office Converter" />
                     </StackPanel>
                 </Grid>
-                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png"/>
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png" />
                     </Border>
-                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0">
-                        <TextBlock Text="Page Edit" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                        <TextBlock Margin="0,4,0,0" Text="Insert, Replace, Split, Extract"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                    <StackPanel
+                        Height="42"
+                        Margin="42,0,0,0"
+                        HorizontalAlignment="Left">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="Page Edit" />
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="Insert, Replace, Split, Extract" />
                     </StackPanel>
                 </Grid>
-                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
-                    <Border Width="36" Height="36" HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png"/>
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png" />
                     </Border>
-                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0" >
-                        <TextBlock Text="More Features" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
-                        <TextBlock Margin="0,4,0,0" Text="More features to look forward"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
+                    <StackPanel
+                        Height="42"
+                        Margin="42,0,0,0"
+                        HorizontalAlignment="Left">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="More Features" />
+                        <TextBlock
+                            Height="18"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            LineHeight="28"
+                            Text="More features to look forward" />
                     </StackPanel>
                 </Grid>
             </StackPanel>
             <!--<TextBlock Text="Subscribe Now" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" Foreground="#3F8FF6"  LineHeight="20" Margin="150,380,0,0" Width="82" Height="20" />-->
-            <Button Content="Subscribe Now" Background="Transparent"  Margin="150,380,0,0" Width="84" Height="20" Foreground="#3F8FF6" FontWeight="SemiBold" FontSize="12" FontFamily="Segoe UI" BorderThickness="0" />
-        </Grid> 
+            <TextBlock
+                Width="84"
+                Height="20"
+                Margin="150,380,0,0"
+                Background="Transparent"
+                FontFamily="Segoe UI"
+                FontSize="12"
+                FontWeight="SemiBold"
+                Foreground="#3F8FF6" >
+                   <Hyperlink Command="{Binding OpenIAPCommand}">
+                        <TextBlock Text="Subscribe Now" />
+                    </Hyperlink>
+            </TextBlock>
+        </Grid>
         <Grid Grid.Column="1">
             <ContentControl prism:RegionManager.RegionName="{Binding RegisterRegionName}" Visibility="Visible" />
         </Grid>