比较表-调整比较表显示路径

PDF Office/ViewModels/Dialog/ToolsDialogs/CompressDialogs/CompressDialogViewModel.cs

@@ -197,31 +197,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.CompressDialogs
             return 0;
         }
         private void Compress()
-        {//判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
+        {
 
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-               
-                return;
-            }
             System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
             /*
              *设置这个对话框的起始保存路径

PDF Office/ViewModels/Dialog/ToolsDialogs/MergeDialogViewModel.cs

@@ -253,31 +253,6 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
 
         private void Merge()
         {
-          
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                return;
-            }
             bool result = true;
             CPDFDocument SaveDoc = CPDFDocument.CreateDocument();
             for (int i = 0; i < MergeObjectlist.Count; i++)

PDF Office/ViewModels/Dialog/ToolsDialogs/SaftyDialogs/DeleteSafetySettingsDialogViewModel.cs

@@ -167,31 +167,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
         /// 去除安全性设置2.0
         /// </summary>
         public void RemoveSecuritySettings()
-        {//判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
+        {
 
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-               
-                return;
-            }
             viewContentViewModel.SecurityInfo.NeedOpenPassword = false;
             viewContentViewModel.SecurityInfo.NeedPermissionsPassword = false;
             viewContentViewModel.SecurityInfo.OpenPassword = string.Empty;

PDF Office/ViewModels/Dialog/ToolsDialogs/SaftyDialogs/SetPasswordDialogViewModel.cs

@@ -426,31 +426,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
         }
 
         public void Encrypt()
-        {//判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
+        {
 
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                
-                return;
-            }
             if (haveViewModel)
             {
                 viewContentViewModel.SecurityInfo.IsPasswordChanged = true;

PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -446,29 +446,8 @@ namespace PDF_Master.ViewModels.FillAndSign
             bool isTemplateAnnot = false;
             bool isSnapshotEdit = false;
             AnnotHandlerEventArgs annotArgs = null;
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-               
                 return;
             }
             var tag = control.Name;

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -61,7 +61,7 @@ namespace PDF_Master.ViewModels.PageEdit
 
         public CPDFViewer PDFViewer;
 
-        private ViewContentViewModel viewContentViewModel;
+        public ViewContentViewModel viewContentViewModel;
 
         private IDialogService dialogs;
 
@@ -1132,31 +1132,11 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private void copy()
         {
-           
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
+            if(!viewContentViewModel.IAPBeforeFunction())
             {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
                 return;
             }
+          
             VerifyPasswordResult verifyResult = SecurityHelper.VerifyPasswordForSelectedPermissions(PDFViewer.Document, EnumPermissionsSet.StatusAllowsCopying, dialogs);
             if (verifyResult.IsDiscryptied)
             {
@@ -1203,31 +1183,11 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         private async void paste(int Index=-1)
         {
-         
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
                 return;
             }
+
             IsLoading = Visibility.Visible;
             int insertindex = maxSelectedIndex > listSelecedIndex ? maxSelectedIndex : listSelecedIndex;
             insertindex++;
@@ -1470,31 +1430,12 @@ namespace PDF_Master.ViewModels.PageEdit
         /// 方便其他逻辑中调用
         /// </summary>
         private void DoRemoveSelectedPages(List<int> pageList = null, bool isFromUndoRedo = false)
-        {//判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
+        {
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-              
                 return;
             }
+
             List<int> indexList = new List<int>();
             if (pageList == null || pageList.Count < 0)
             {
@@ -2009,29 +1950,8 @@ namespace PDF_Master.ViewModels.PageEdit
         /// <param name="rightRotate"></param>
         private async void RotateSelectedPages(bool rightRotate = true, List<int> pageitems = null, bool isFromUndoRedo = false)
         {
-           
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
                 return;
             }
 

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -311,29 +311,9 @@ namespace PDF_Master.ViewModels.Tools
                 case "Stamp"://图章
                              //付费锁
                              //判断本地有没有token，没有显示登录，有再判断登录状态
-                    if (Settings.Default.AppProperties.LoginToken != "")
+                    if (!viewContentViewModel.IAPBeforeFunction())
                     {
-
-                        if (ServiceHelper.GetUser() == "401")
-                        {
-                            App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                            App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                            App.mainWindowViewModel.OphVis = Visibility.Visible;
-                        }
-
-                    }
-                    else
-                    {
-                        App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                        App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                        App.mainWindowViewModel.OphVis = Visibility.Visible;
-                    }
-                    if (!App.IsLogin)
-                    {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                        //弹出比较表后取消工具选中
-                        StrAnnotToolChecked = "";
-                        return;
+                        return;
                     }
                     annotArgs = GetStamp();
 
@@ -345,30 +325,9 @@ namespace PDF_Master.ViewModels.Tools
 
                 case "Signature"://签名
                                  //判断本地有没有token，没有显示登录，有再判断登录状态
-                    if (Settings.Default.AppProperties.LoginToken != "")
-                    {
-
-                        if (ServiceHelper.GetUser() == "401")
-                        {
-                            App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                            App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                            App.mainWindowViewModel.OphVis = Visibility.Visible;
-                        }
-
-                    }
-                    else
+                    if (!viewContentViewModel.IAPBeforeFunction())
                     {
-                        App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                        App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                        App.mainWindowViewModel.OphVis = Visibility.Visible;
-                    }
-                    //付费锁
-                    if (!App.IsLogin)
-                    {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                        //弹出比较表后取消工具选中
-                        StrAnnotToolChecked = "";
-                        return;
+                        return;
                     }
                     annotArgs = GetSignature();
                     PDFViewer.SetMouseMode(MouseModes.PanTool);//清空其他注释
@@ -377,29 +336,9 @@ namespace PDF_Master.ViewModels.Tools
                 case "Link"://链接
                             //付费锁
                             //判断本地有没有token，没有显示登录，有再判断登录状态
-                    if (Settings.Default.AppProperties.LoginToken != "")
+                    if (!viewContentViewModel.IAPBeforeFunction())
                     {
-
-                        if (ServiceHelper.GetUser() == "401")
-                        {
-                            App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                            App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                            App.mainWindowViewModel.OphVis = Visibility.Visible;
-                        }
-
-                    }
-                    else
-                    {
-                        App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                        App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                        App.mainWindowViewModel.OphVis = Visibility.Visible;
-                    }
-                    if (!App.IsLogin)
-                    {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                        //弹出比较表后取消工具选中
-                        StrAnnotToolChecked = "";
-                        return;
+                        return;
                     }
                     PropertyPanel.IsAddLink = true;
                     viewContentViewModel.IsRightMenuCreateLink = isRightMenuAdd;

PDF Office/ViewModels/Tools/ConverterBarContentViewModel.cs

@@ -65,29 +65,9 @@ namespace PDF_Master.ViewModels.Tools
         }
 
         private async void toconverter(object sender)
-        {//判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
-            {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
+        {
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-               
                 return;
             }
 

PDF Office/ViewModels/Tools/ToolsBarContentViewModel.cs

@@ -190,6 +190,10 @@ namespace PDF_Master.ViewModels.Tools
 
         private async void OpenCompressDialog()
         {
+            if (!viewContentViewModel.IAPBeforeFunction())
+            {
+                return;
+            }
             await  viewContentViewModel.SaveBeforeOption();
             DialogParameters value = new DialogParameters();
             value.Add(ParameterNames.PDFViewer, PDFViewer);
@@ -242,6 +246,10 @@ namespace PDF_Master.ViewModels.Tools
         //}
         private async void MergeDialog()
         {
+            if (!viewContentViewModel.IAPBeforeFunction())
+            {
+                return;
+            }
             await viewContentViewModel.SaveBeforeOption();
             DialogParameters value = new DialogParameters();
             value.Add(ParameterNames.PDFViewer, PDFViewer);
@@ -252,6 +260,10 @@ namespace PDF_Master.ViewModels.Tools
 
         private void OpenSetPasswordDialog()
         {
+            if (!viewContentViewModel.IAPBeforeFunction())
+            {
+                return;
+            }
             VerifyPasswordResult result = SecurityHelper.VerifyPasswordByPasswordKind(PDFViewer.Document, EnumPasswordKind.StatusPermissionsPassword, dialogs);
             if (result.IsDiscryptied)
             {
@@ -292,6 +304,10 @@ namespace PDF_Master.ViewModels.Tools
             }
             else
             {
+                if (!viewContentViewModel.IAPBeforeFunction())
+                {
+                    return;
+                }
                 VerifyPasswordResult result = SecurityHelper.VerifyPasswordByPasswordKind(PDFViewer.Document, EnumPasswordKind.StatusPermissionsPassword, dialogs);
                 if (result.IsDiscryptied)
                 {
@@ -337,30 +353,11 @@ namespace PDF_Master.ViewModels.Tools
         private async Task WaitCropCurrentPageWM()
         {
 
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
                 return;
             }
+
             await Task.Run(() =>
             {
                 if (PDFViewer.CurrentIndex >= 0)
@@ -378,30 +375,11 @@ namespace PDF_Master.ViewModels.Tools
         private async Task WaitCropAllPagesWM()
         {
 
-            //判断本地有没有token，没有显示登录，有再判断登录状态
-            if (Settings.Default.AppProperties.LoginToken != "")
+            if (!viewContentViewModel.IAPBeforeFunction())
             {
-
-                if (ServiceHelper.GetUser() == "401")
-                {
-                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                    App.mainWindowViewModel.OphVis = Visibility.Visible;
-                }
-
-            }
-            else
-            {
-                App.mainWindowViewModel.UserVis = Visibility.Collapsed;
-                App.mainWindowViewModel.LoginVis = Visibility.Visible;
-                App.mainWindowViewModel.OphVis = Visibility.Visible;
-            }
-            //付费锁
-            if (!App.IsLogin)
-            {
-                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
                 return;
             }
+
             await Task.Run(() =>
             {
                 List<int> cropPagesList = new List<int>();

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -2001,6 +2001,43 @@ namespace PDF_Master.ViewModels
             TipVisible = Visibility.Collapsed;
         }
 
+        /// <summary>
+        /// 高级功能前弹出比较表
+        /// </summary>
+        /// <param name="post">是否请求服务器</param>
+        public bool IAPBeforeFunction(bool post = false)
+        {
+            if (post)
+            {
+                //判断本地有没有token，没有显示登录，有再判断登录状态
+                if (Settings.Default.AppProperties.LoginToken != "")
+                {
+
+                    if (ServiceHelper.GetUser() == "401")
+                    {
+                        App.mainWindowViewModel.UserVis = Visibility.Collapsed;
+                        App.mainWindowViewModel.LoginVis = Visibility.Visible;
+                        App.mainWindowViewModel.OphVis = Visibility.Visible;
+                    }
+
+                }
+                else
+                {
+                    App.mainWindowViewModel.UserVis = Visibility.Collapsed;
+                    App.mainWindowViewModel.LoginVis = Visibility.Visible;
+                    App.mainWindowViewModel.OphVis = Visibility.Visible;
+                }
+            }
+
+            //付费锁
+            if (!App.IsLogin)
+            {
+                dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                return false;
+            }
+            return true;
+        }
+
         #region PDFViewer鼠标滚轮缩放事件
 
         public void PdfViewer_MouseWheelZoomHandler(object sender, bool e)

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

@@ -598,6 +598,7 @@ namespace PDF_Master.Views.PageEdit
         /// <param name="e"></param>
         private async void ListPageEdit_Drop(object sender, DragEventArgs e)
         {
+            isDragingEnter = false;
             needScroll = false;
             if (!isDraging)
             {
@@ -614,13 +615,10 @@ namespace PDF_Master.Views.PageEdit
                 return;
             }
             #region 功能付费锁
-            //    //if (!App.IsActive())
-            //    //{
-            //    //    MidLane.Visibility = Visibility.Collapsed;
-            //    //    IAPFunctionDialog dialog = new IAPFunctionDialog("PageEdit");
-            //    //    dialog.ShowDialog();
-            //    //    return;
-            //    //}
+            if((bool)!viewModel?.viewContentViewModel.IAPBeforeFunction())
+            {
+                return;
+            }
             #endregion
 
             #region  从外部拖拽插入文件