轻会员-权益弹窗-水印保存-文件占用问题修复;编辑- Bug18869修复，卡顿优化，偏好设置-Bug18860修复

PDF Office/Helper/ServiceHelper.cs

@@ -324,6 +324,7 @@ namespace PDF_Master.Helper
                     {
                         App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                         App.mainWindowViewModel.LoginVis = Visibility.Visible;
+                        App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                         App.mainWindowViewModel.OphVis = Visibility.Visible;
 
                         if (Settings.Default.UserDate.IsLoginoff == false)
@@ -338,6 +339,7 @@ namespace PDF_Master.Helper
                 {
                     App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                     App.mainWindowViewModel.LoginVis = Visibility.Visible;
+                    App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                     App.mainWindowViewModel.OphVis = Visibility.Visible;
                 }
             }

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

@@ -265,6 +265,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 {
                     App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                     App.mainWindowViewModel.LoginVis = Visibility.Visible;
+                    App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                     App.mainWindowViewModel.OphVis = Visibility.Visible;
 
                     if (Settings.Default.UserDate.IsLoginoff == false)
@@ -279,6 +280,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             {
                 App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                 App.mainWindowViewModel.LoginVis = Visibility.Visible;
+                App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                 App.mainWindowViewModel.OphVis = Visibility.Visible;
             }
 

PDF Office/ViewModels/Dialog/SettingsDialogViewModel.cs

@@ -1008,6 +1008,12 @@ namespace PDF_Master.ViewModels.Dialog
             {
                 case 0:
                     Descript.Reset();
+                    //未付费用户不进行自动保存
+                    if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+                    {
+                        AutoSaveEnable = false;
+                        Descript.AutoSave = false;
+                    }
                     break;
                 case 1:
                     View.Reset();
@@ -1029,6 +1035,12 @@ namespace PDF_Master.ViewModels.Dialog
         {
             View.Reset();
             Descript.Reset();
+            //未付费用户不进行自动保存
+            if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+            {
+                AutoSaveEnable = false;
+                Descript.AutoSave = false;
+            }
             Annote.Reset();
             InitAnnote();
             InitView();

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -476,6 +476,7 @@ namespace PDF_Master.ViewModels
 
                     UserVis = Visibility.Collapsed;
                     LoginVis = Visibility.Visible;
+                    RegisterVis = Visibility.Collapsed;
                     OphVis = Visibility.Visible;
                     if (Settings.Default.UserDate.IsLoginoff == false)
                     {
@@ -498,6 +499,7 @@ namespace PDF_Master.ViewModels
             {
 
                 LoginVis = Visibility.Visible;
+                RegisterVis = Visibility.Collapsed;
                 OphVis = Visibility.Visible;
                 OpenLogin();
             }

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -26,6 +26,7 @@ using PDF_Master.EventAggregators;
 using Prism.Events;
 using System.Windows.Media.Imaging;
 using PDFReader_WPF.Helper;
+using PDF_Master.Properties;
 
 namespace PDF_Master.ViewModels.Tools
 {
@@ -364,13 +365,14 @@ namespace PDF_Master.ViewModels.Tools
         public void AddContent(object obj)
         {
             if (PDFViewer == null || obj == null || obj as CustomIconToggleBtn == null) return;
-            //添加付费拦截锁,限制编辑操作
-            if (!ServiceHelper.IAPBeforeFunction())
+            //判断是否已退出登录,限制编辑操作
+            if (!App.IsLogin)
             {
                 IsImgEdit = false;
                 IsTextEdit = false;
                 PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.None);
-                PDFViewer.ReloadDocument();
+                PDFViewer.ReloadDocument();              
+                App.mainWindowViewModel.OpenLogin();
                 return;
             }
             var btn = obj as CustomIconToggleBtn;
@@ -662,13 +664,14 @@ namespace PDF_Master.ViewModels.Tools
         //左键激活逻辑
         private void PDFViewer_PDFEditActiveHandler(object sender, List<PDFEditEvent> e)
         {
-            //添加付费拦截锁,限制编辑操作
-            if (!ServiceHelper.IAPBeforeFunction())
+            //判断是否已退出登录,限制编辑操作
+            if (!App.IsLogin)
             {
                 IsImgEdit = false;
                 IsTextEdit = false;
                 PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.None);
                 PDFViewer.ReloadDocument();
+                App.mainWindowViewModel.OpenLogin();
                 return;
             }
             if (e != null && e.Count > 0)

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -3082,7 +3082,9 @@ namespace PDF_Master.ViewModels
 
                     if (App.OpenedFileList.Contains(dlg.FileName))
                     {
-                        //提示文件已经被打开
+                        //文件已经被打开
+                        AlertsMessage alertsMessage = new AlertsMessage();
+                        alertsMessage.ShowDialog("保存失败", "文件被其它程序占用，无法完成操作请用不同的名称或不同文件夹保存该文档", App.ServiceLoader.GetString("Text_yes"), IconType.Tip);
                     }
                     else
                     {
@@ -3155,10 +3157,9 @@ namespace PDF_Master.ViewModels
                             DoAfterSaveAs(dlg.FileName);
                         }
                         else
-                        {
-                            //提示文件被其他软件占用 无法保存
-                            //
-                            //Ex.Show(App.MainPageLoader.GetString("Main_TheFileOccupiedWarning"), "", Winform.MessageBoxButtons.OKCancel, new string[] { App.MainPageLoader.GetString("Main_SaveAs"), App.MainPageLoader.GetString("Main_Cancel") });
+                        {   //提示文件被其他软件占用 无法保存          
+                            AlertsMessage alertsMessage = new AlertsMessage();
+                            alertsMessage.ShowDialog("保存失败", "文件被其它程序占用，无法完成操作请用不同的名称或不同文件夹保存该文档", App.ServiceLoader.GetString("Text_yes"), IconType.Tip);
                         }
                     }
                     return result;
@@ -3206,7 +3207,9 @@ namespace PDF_Master.ViewModels
 
                     if (App.OpenedFileList.Contains(dlg.FileName))
                     {
-                        //提示文件已经被打开
+                        //文件已经被占用
+                        AlertsMessage alertsMessage = new AlertsMessage();
+                        alertsMessage.ShowDialog("保存失败", "文件被其它程序占用，无法完成操作请用不同的名称或不同文件夹保存该文档", App.ServiceLoader.GetString("Text_yes"), IconType.Tip);
                     }
                     else
                     {
@@ -3284,9 +3287,9 @@ namespace PDF_Master.ViewModels
                         }
                         else
                         {
-                            //提示文件被其他软件占用 无法保存
-                            //
-                            //Ex.Show(App.MainPageLoader.GetString("Main_TheFileOccupiedWarning"), "", Winform.MessageBoxButtons.OKCancel, new string[] { App.MainPageLoader.GetString("Main_SaveAs"), App.MainPageLoader.GetString("Main_Cancel") });
+                            //文件已经被占用
+                            AlertsMessage alertsMessage = new AlertsMessage();
+                            alertsMessage.ShowDialog("保存失败", "文件被其它程序占用，无法完成操作请用不同的名称或不同文件夹保存该文档", App.ServiceLoader.GetString("Text_yes"), IconType.Tip);
                         }
                     }
                     return result;