BUG-17678，18632，18633，18562，18424修复

(cherry picked from commit 94016502700089c35fbd4c3f5b9d9c9220ba8245)

PDF Office/App.xaml.cs

@@ -332,7 +332,7 @@ namespace PDF_Master
             InitSettings();
 
 #if DEBUG
-            IsLogin = true;
+            IsLogin = false;
 #endif
 
             CachePath = CacheFilePath.Instance;

PDF Office/Helper/ADServiceHelper.cs

@@ -19,8 +19,13 @@ namespace PDF_Master.Helper
     //本辅助类不使用viewmodel,因为同时在PDFreaderPro上使用
     public static class ADServiceHelper
     {
-       
+
+#if DEBUG
         public static string RequestHost = "http://test-store.kdan.cn:3019";
+#else
+        public static string RequestHost = "https://store.filmagepro.com:3018";
+
+#endif
         public static string AdUrl = "/api/advertise-new";
    
 

PDF Office/Model/AnnotPanel/FontBoard.cs

@@ -552,6 +552,10 @@ namespace PDF_Master.Model.AnnotPanel
             {
                 uiStr = "Times New Roman";
             }
+            if(fontFamily == "Courier")
+            {
+                uiStr = "Courier New";
+            }
             CurrentFontFamily = new ComboDataItem(fontFamily, uiStr);
         }
 

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -630,6 +630,10 @@
           <source>Users have already subscribed to PDF Master</source>
           <target state="new">Users have already subscribed to PDF Master</target>
         </trans-unit>
+        <trans-unit id="BtnTextContinue" translate="yes" xml:space="preserve">
+          <source>Continue</source>
+          <target state="new">Continue</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -630,6 +630,10 @@
           <source>Users have already subscribed to PDF Master</source>
           <target state="new">Users have already subscribed to PDF Master</target>
         </trans-unit>
+        <trans-unit id="BtnTextContinue" translate="yes" xml:space="preserve">
+          <source>Continue</source>
+          <target state="new">Continue</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -630,6 +630,10 @@
           <source>Users have already subscribed to PDF Master</source>
           <target state="new">Users have already subscribed to PDF Master</target>
         </trans-unit>
+        <trans-unit id="BtnTextContinue" translate="yes" xml:space="preserve">
+          <source>Continue</source>
+          <target state="new">Continue</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -60,6 +60,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Continue 的本地化字符串。
+        /// </summary>
+        public static string BtnTextContinue {
+            get {
+                return ResourceManager.GetString("BtnTextContinue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Save with Watermark 的本地化字符串。
         /// </summary>

PDF Office/Strings/Service/Service.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="BtnTextContinue" xml:space="preserve">
+    <value>Continue</value>
+  </data>
   <data name="BtnTextSavewithWatermark" xml:space="preserve">
     <value>Save with Watermark</value>
   </data>

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

@@ -95,28 +95,28 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public string TextSubscriptionBenefit
         {
             get { return _TextSubscriptionBenefit; }
-            set { _TextSubscriptionBenefit = value; }
+            set { SetProperty(ref _TextSubscriptionBenefit, value); }
         }
 
         private string _TextSavewithout;
         public string TextSavewithout
         {
             get { return _TextSavewithout; }
-            set { _TextSavewithout = value; }
+            set { SetProperty(ref _TextSavewithout, value); }
         }
 
         private string _TextWhenyou;
         public string TextWhenyou
         {
             get { return _TextWhenyou; }
-            set { _TextWhenyou = value; }
+            set { SetProperty(ref _TextWhenyou, value); }
         }
 
         private string _TextConvertPDF;
         public string TextConvertPDF
         {
             get { return _TextConvertPDF; }
-            set { _TextConvertPDF = value; }
+            set { SetProperty(ref _TextConvertPDF, value); }
         }
 
 
@@ -124,28 +124,28 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public string TextConvertPDFto
         {
             get { return _TextConvertPDFto; }
-            set { _TextConvertPDFto = value; }
+            set { SetProperty(ref _TextConvertPDFto, value); }
         }
 
         private string _TextAIassitant;
         public string TextAIassitant
         {
             get { return _TextAIassitant; }
-            set { _TextAIassitant = value; }
+            set { SetProperty(ref _TextAIassitant, value); }
         }
 
         private string _TextSupportAI;
         public string TextSupportAI
         {
             get { return _TextSupportAI; }
-            set { _TextSupportAI = value; }
+            set { SetProperty(ref _TextSupportAI, value); }
         }
 
         private string _BtnTextSavewithWatermark;
         public string BtnTextSavewithWatermark
         {
             get { return _BtnTextSavewithWatermark; }
-            set { _BtnTextSavewithWatermark = value; }
+            set { SetProperty(ref _BtnTextSavewithWatermark, value); }
         }
 
 
@@ -153,7 +153,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public string Textoff
         {
             get { return _Textoff; }
-            set { _Textoff = value; }
+            set { SetProperty(ref _Textoff, value); }
         }
 
 
@@ -161,7 +161,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public string BtnTextSubscribe
         {
             get { return _BtnTextSubscribe; }
-            set { _BtnTextSubscribe = value; }
+            set { SetProperty(ref _BtnTextSubscribe, value); }
         }
 
 
@@ -192,10 +192,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             TextConvertPDFto = App.ServiceLoader.GetString("TextConvertPDFto");
             TextAIassitant = App.ServiceLoader.GetString("TextAIassitant");
             TextSupportAI = App.ServiceLoader.GetString("TextSupportAI");
-            BtnTextSavewithWatermark = App.ServiceLoader.GetString("BtnTextSavewithWatermark");
             Textoff = App.ServiceLoader.GetString("Textoff");
             BtnTextSubscribe = App.ServiceLoader.GetString("BtnTextSubscribe");
-
         }
 
 
@@ -318,6 +316,14 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 LeftBtnVis = Visibility.Collapsed;
                 RightBtnWidth = 280;
             }
+            if (open == "Auto")
+            {
+                BtnTextSavewithWatermark = App.ServiceLoader.GetString("BtnTextContinue");
+            }
+            else
+            {
+                BtnTextSavewithWatermark = App.ServiceLoader.GetString("BtnTextSavewithWatermark");
+            }
         }
 
     }   

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -363,7 +363,15 @@ namespace PDF_Master.ViewModels.Tools
         public void AddContent(object obj)
         {
             if (PDFViewer == null || obj == null || obj as CustomIconToggleBtn == null) return;
-
+            //添加付费拦截锁,限制编辑操作
+            if (!ServiceHelper.IAPBeforeFunction())
+            {
+                IsImgEdit = false;
+                IsTextEdit = false;
+                PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.None);
+                PDFViewer.ReloadDocument();
+                return;
+            }
             var btn = obj as CustomIconToggleBtn;
             EnterEditMode((bool)btn.IsChecked, btn.Tag.ToString());
         }
@@ -645,7 +653,15 @@ namespace PDF_Master.ViewModels.Tools
         //左键激活逻辑
         private void PDFViewer_PDFEditActiveHandler(object sender, List<PDFEditEvent> e)
         {
-
+            //添加付费拦截锁,限制编辑操作
+            if (!ServiceHelper.IAPBeforeFunction())
+            {
+                IsImgEdit = false;
+                IsTextEdit = false;
+                PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.None);
+                PDFViewer.ReloadDocument();
+                return;
+            }
             if (e != null && e.Count > 0)
             {
                 TextEditEvent=e[0];
@@ -702,7 +718,6 @@ namespace PDF_Master.ViewModels.Tools
         //右键点击逻辑
         private void PDFViewer_PDFEditCommandHandler(object sender, PDFEditCommand e)
         {
-            
             if (e == null)
                 return;
 
@@ -771,7 +786,7 @@ namespace PDF_Master.ViewModels.Tools
         //图片添加逻辑
         private void PDFViewer_CustomNotifyHandler(object sender, CustomNotityData e)
         {
-
+            //图片创建
             if (e.NotifyType == CustomNotifyType.PDFEditImageCreate)
                 {
                     OpenFileDialog openFileDialog = new OpenFileDialog();
@@ -782,6 +797,7 @@ namespace PDF_Master.ViewModels.Tools
                     events.GetEvent<PageEditNotifyEvent>().Publish(new PageEditNotifyEventArgs(unicode));
                 }
                 }
+            //图片调整大小
             else if(e.NotifyType == CustomNotifyType.PDFEditImageResize)
             {
                 REImgflg = true;

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -2762,6 +2762,10 @@ namespace PDF_Master.ViewModels
                 {
                     DialogParameters value = new DialogParameters();
                     value.Add(ParameterNames.ViewContentViewModel, this);
+                    if(autosave)
+                    {
+                        value.Add(ParameterNames.Open, "Auto");
+                    }
                     dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
                     {
                         if (dialogResult.Result == ButtonResult.OK)
@@ -2777,7 +2781,9 @@ namespace PDF_Master.ViewModels
                 }
 
                 if ((string.IsNullOrEmpty(PDFViewer.Document.FilePath) || mainViewModel.NewFile) && !autosave)
+                {
                     return saveAsFile();
+                }
 
                 //文档已被修复时 提示另存为
                 if (PDFViewer.Document.HasRepaired)
@@ -3280,9 +3286,28 @@ namespace PDF_Master.ViewModels
         /// </summary>
         private void saveAsFlatten()
         {
-            if (!ServiceHelper.IAPBeforeFunction())
+            bool flg = false;
+            //权益弹窗
+            if ((!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1) && (App.mainWindowViewModel.SelectedItem.DataContext as MainContentViewModel).IsUsedVIP == true)
             {
-                return;
+                DialogParameters value = new DialogParameters();
+                value.Add(ParameterNames.ViewContentViewModel, this);
+                dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
+                {
+                    if (dialogResult.Result == ButtonResult.OK)
+                    {
+                        flg = true;
+                    }
+                    else
+                    {
+                        flg = false;
+                    }
+                });
+
+                if (flg == false)
+                {
+                    return ;
+                }
             }
             var dlg = new SaveFileDialog();
             dlg.Filter = Properties.Resources.OpenDialogFilter;