编辑-bug17766解决，轻会员-所有试用策略屏蔽，轻会员-登录限制逻辑

PDF Office/Helper/ServiceHelper.cs

@@ -287,12 +287,22 @@ namespace PDF_Master.Helper
                     {
                         App.IsLogin = true;
                         Settings.Default.UserDate.Email= jobject["email"].ToObject<string>().ToLower();
-                        Settings.Default.UserDate.isInFreeUseTime= jobject["isInFreeUseTime"].ToObject<bool>();
-                        Settings.Default.UserDate.freeDate= jobject["freeDate"].ToObject<string>().ToLower();
-                        if(DateTime.Parse(Settings.Default.UserDate.freeDate)<=DateTime.Now)
-                        {
-                            Settings.Default.UserDate.isInFreeUseTime = false;
-                        }
+                        Settings.Default.UserDate.id= jobject["id"].ToObject<string>().ToLower();
+                        //Settings.Default.UserDate.subscribed= jobject["subscribed"].ToObject<string>().ToLower();
+                        Settings.Default.UserDate.subscribed= "0";
+                        //Settings.Default.UserDate.subscriberType = jobject["subscriberType"].ToObject<string>().ToLower();
+                        Settings.Default.UserDate.subscriberType = "0";
+                        //Settings.Default.UserDate.subscriptionendDate = jobject["subscriptionendDate"].ToObject<string>().ToLower();
+                        Settings.Default.UserDate.subscriptionendDate = "2023-06-01 08:00:00";
+
+                        #region 试用策略
+                        //Settings.Default.UserDate.isInFreeUseTime= jobject["isInFreeUseTime"].ToObject<bool>();
+                        //Settings.Default.UserDate.freeDate= jobject["freeDate"].ToObject<string>().ToLower();
+                        //if(DateTime.Parse(Settings.Default.UserDate.freeDate)<=DateTime.Now)
+                        //{
+                        //    Settings.Default.UserDate.isInFreeUseTime = false;
+                        //}
+                        #endregion
                         App.mainWindowViewModel.Useremailchar = Settings.Default.UserDate.Email.Substring(0, 1);
                         Settings.Default.Save();
                         return "ture";
@@ -312,10 +322,11 @@ namespace PDF_Master.Helper
                     //从网络异常信息里解析错误，后面的逻辑根据错误码判断会更准确
                     statusCode = (int)((HttpWebResponse)e.Response).StatusCode;
                 }
-                if (DateTime.Parse(Settings.Default.UserDate.freeDate) <= DateTime.Now)
-                {
-                    Settings.Default.UserDate.isInFreeUseTime = false;
-                }
+                //试用策略注释
+                //if (DateTime.Parse(Settings.Default.UserDate.freeDate) <= DateTime.Now)
+                //{
+                //    Settings.Default.UserDate.isInFreeUseTime = false;
+                //}
                 Console.WriteLine(e.Message);
                 //无权限
                 if (Settings.Default.AppProperties.LoginToken == "")
@@ -329,10 +340,11 @@ namespace PDF_Master.Helper
             }
             catch
             {
-                if (DateTime.Parse(Settings.Default.UserDate.freeDate) <= DateTime.Now)
-                {
-                    Settings.Default.UserDate.isInFreeUseTime = false;
-                }
+                //试用策略注释
+                //if (DateTime.Parse(Settings.Default.UserDate.freeDate) <= DateTime.Now)
+                //{
+                //    Settings.Default.UserDate.isInFreeUseTime = false;
+                //}
                 return "300";
             }
            

PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs

@@ -147,8 +147,9 @@ namespace PDF_Master.ViewModels.HomePanel.PDFTools
                 dlg.Filter = Properties.Resources.imageex.ToLower() + "|*";
             }
             //付费锁 图片转PDF不用加锁
-         
-            if (toolItem.FnType != PDFFnType.ImageToPDF&&(!App.IsLogin || Settings.Default.UserDate.isInFreeUseTime == false) )
+
+            //删掉Settings.Default.UserDate.isInFreeUseTime == false，去掉试用策略
+            if (toolItem.FnType != PDFFnType.ImageToPDF&&(!App.IsLogin) )
             {
                 dialogs.ShowDialog(DialogNames.IAPCompareDialog);
                 return ;

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -374,6 +374,12 @@ namespace PDF_Master.ViewModels
 
                     LoginVis = Visibility.Visible;
                     OphVis = Visibility.Visible;
+                    if (Settings.Default.UserDate.IsLoginoff == false)
+                    {
+                        App.mainWindowViewModel.OpenLoginoff();
+                        Settings.Default.UserDate.IsLoginoff = true;
+                        Settings.Default.Save();
+                    }
                 }
                 else
                 {
@@ -441,7 +447,12 @@ namespace PDF_Master.ViewModels
                     UserVis = Visibility.Collapsed;
                     LoginVis = Visibility.Visible;
                     OphVis = Visibility.Visible;
-                    OpenLoginoff();
+                    if (Settings.Default.UserDate.IsLoginoff == false)
+                    {
+                        App.mainWindowViewModel.OpenLoginoff();
+                        Settings.Default.UserDate.IsLoginoff = true;
+                        Settings.Default.Save();
+                    }
 
 
                 }

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -24,6 +24,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using PDF_Master.EventAggregators;
 using Prism.Events;
+using System.Windows.Media.Imaging;
 
 namespace PDF_Master.ViewModels.Tools
 {
@@ -280,7 +281,9 @@ namespace PDF_Master.ViewModels.Tools
                         //缩小esc的操作范围
                         if (PDFViewer.ToolManager != null && PDFViewer.GetPDFEditCreateType() == ComPDFKit.PDFPage.CPDFEditType.EditText)
                         {
-                            PDFViewer.RemovePDFEditEmptyText();
+                            if(PDFViewer.GetPDFEditSelectionCount(ComPDFKit.PDFPage.CPDFEditType.EditText) ==0)
+                            {
+                              PDFViewer.RemovePDFEditEmptyText(); 
                             //只有在有画框的时候才进行
                             if (PDFViewer.MouseMode == MouseModes.PDFEdit&& PDFViewer.ToolManager.HasTool == true)
                             {
@@ -298,27 +301,40 @@ namespace PDF_Master.ViewModels.Tools
                                 PDFViewer.ReloadDocument();
                                 ShowPropertyPanel(false);
                             }
+                            }
+                            {
+                                PDFViewer.ClearSelectPDFEdit();
+                                PDFViewer.ReloadDocument();
+                            }
+                          
                         }
 
                         else if (PDFViewer.ToolManager != null && PDFViewer.GetPDFEditCreateType() == ComPDFKit.PDFPage.CPDFEditType.EditImage)
                         {
-
-                            PDFViewer.RemovePDFEditEmptyText();
-                            if (PDFViewer.MouseMode == MouseModes.PDFEdit&&PDFViewer.ToolManager.HasTool == true)
+                            if (PDFViewer.GetPDFEditSelectionCount(ComPDFKit.PDFPage.CPDFEditType.EditImage) == 0)
                             {
-                                PDFViewer.RemoveTool(false);
+                                PDFViewer.RemovePDFEditEmptyText();
+                                if (PDFViewer.MouseMode == MouseModes.PDFEdit && PDFViewer.ToolManager.HasTool == true)
+                                {
+                                    PDFViewer.RemoveTool(false);
+                                }
+                                else if (IsTextEdit == true || IsImgEdit == true)
+                                {
+                                    IsImgEdit = false;
+                                    IsTextEdit = false;
+                                    PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.None);
+
+                                    //文本和图像都框选
+                                    PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditText | ComPDFKit.PDFPage.CPDFEditType.EditImage);
+                                    PDFViewer.SetMouseMode(MouseModes.PDFEdit);
+                                    PDFViewer.ReloadDocument();
+                                    ShowPropertyPanel(false);
+                                }
                             }
-                            else if (IsTextEdit == true || IsImgEdit == true)
+                            else
                             {
-                                IsImgEdit = false;
-                                IsTextEdit = false;
-                                PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.None);
-
-                                //文本和图像都框选
-                                PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditText | ComPDFKit.PDFPage.CPDFEditType.EditImage);
-                                PDFViewer.SetMouseMode(MouseModes.PDFEdit);      
+                                PDFViewer.ClearSelectPDFEdit();
                                 PDFViewer.ReloadDocument();
-                                ShowPropertyPanel(false);
                             }
                         }
                         

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -2332,6 +2332,13 @@ namespace PDF_Master.ViewModels
                         App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                         App.mainWindowViewModel.LoginVis = Visibility.Visible;
                         App.mainWindowViewModel.OphVis = Visibility.Visible;
+                       
+                       if( Settings.Default.UserDate.IsLoginoff == false)
+                        {
+                            App.mainWindowViewModel.OpenLoginoff();
+                            Settings.Default.UserDate.IsLoginoff = true;
+                            Settings.Default.Save();
+                        }
                     }
                 }
                 else

PDFSettings/UserDate.cs

@@ -16,6 +16,8 @@ using System.Threading.Tasks;
         public bool TodayRegister { get; set; } = false;
         public string TodayRegisterTime { get; set; } = "2023-06-01 08:00:00";
 
+        public bool IsLoginoff { get; set; } = false;
+
         public string id { get; set; }
         public string companyId { get; set; }
         public string appId { get; set; }
@@ -49,6 +51,9 @@ using System.Threading.Tasks;
         public string validFlag { get; set; }
 
         public List<string> subscriptionInfoList { get; set; }
+
+        public string subscriptionendDate { get; set; }
+
         public string freeDate { get; set; } = "2023-06-01 08:00:00";
         public bool isInFreeUseTime { get; set; } = false;