Merge branch 'develop_PDFReaderPro_V4.7.0' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderPro_V4.7.0

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -116,7 +116,7 @@ NSPopoverDelegate>
     [self.secondTrialBtn setAlignment:NSTextAlignmentCenter];
     self.secondTrialBtn.hidden = YES;
     
-    self.labelContentView.hidden = self.bgImg.hidden = self.button.hidden = YES;
+    self.labelContentView.hidden = self.bgImg.hidden = self.button.hidden = NO;
     
     self.bgImg.wantsLayer = YES;
     self.bgImg.image = [NSImage imageNamed:@"Upgarde_bg_icon"];
@@ -139,20 +139,18 @@ NSPopoverDelegate>
 - (void)reloadData {
     self.label.textColor = [NSColor blackColor];
     self.label.hidden = NO;
-    BOOL isFree = NO;
     self.secondTrialBtn.hidden = YES;
-    self.bgImg.hidden = YES;
     
     if (self.frameUpdateHandle) {
         self.frameUpdateHandle(self.view.frame);
     }
     
     CGFloat totalWidth = 8;
-    self.button.hidden = YES;
+    self.button.hidden = NO;
+    self.bgImg.hidden = NO;
     self.label.hidden = YES;
     self.secondTrialBtn.hidden = YES;
     self.labelContentView.hidden = YES;
-    self.bgImg.hidden = YES;
     self.aiContendView.hidden = YES;
     self.userButton.hidden = YES;
     self.signUpView.hidden = YES;
@@ -172,7 +170,7 @@ NSPopoverDelegate>
     self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade to Pro", nil)];
     [self.button setTitleColor:[NSColor whiteColor]];
     
-    self.aiLabel.stringValue = NSLocalizedStringFromTable(@"Free to receive 1 year of AI", @"MemberCenterLocalizable", nil);
+    self.aiLabel.stringValue = NSLocalizedStringFromTable(@"Free Use 1-Year AI Tools", @"MemberCenterLocalizable", nil);
     [self.aiLabel sizeToFit];
     CGFloat aiWidth = self.aiLabel.frame.size.width;
     aiWidth += 4;
@@ -206,48 +204,33 @@ NSPopoverDelegate>
             totalWidth+=4;
         }
     }
-    if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type1 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type3 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type5 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type7 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type9 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type13 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type11 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypePro_type1 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypePro_type3 ||
-        [KMMemberInfo shared].userScenarioType == KMUserScenarioTypePro_type4) {
-        if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type1) {
+    KMUserScenarioType type = [KMMemberInfo shared].userScenarioType;
+
+    if (type == KMUserScenarioTypeLite_type1 ||
+        type == KMUserScenarioTypeLite_type3 ||
+        type == KMUserScenarioTypeLite_type5 ||
+        type == KMUserScenarioTypeLite_type7 ||
+        type == KMUserScenarioTypeLite_type9 ||
+        type == KMUserScenarioTypeLite_type11 ||
+        type == KMUserScenarioTypePro_type1 ||
+        type == KMUserScenarioTypePro_type3 ||
+        type == KMUserScenarioTypePro_type4) {
+        if (type == KMUserScenarioTypeLite_type1) { //免费用户
 #if !VERSION_DMG
-            if(IAPProductsManager.defaultManager.fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == YES) {
+            if(IAPProductsManager.defaultManager.fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == YES)  { //是否有试用
                 self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade", nil)];
             } else {
                 self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Free Trial", nil)];
             }
 #else
 #endif
-            
-            if (KMAdvertisementManager.manager.info.topRightInfoContent != nil) {
-                if (KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject != nil) {
-                    KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject;
-                    NSString *name = [KMAdvertisementModelTransition transitionLanguageWithLangeuage:info.name];
-                    self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(name, nil)];
-                    
-                    NSURL *url = [NSURL URLWithString: [KMAdvertisementModelTransition transitionImagePathWithImage:info.image highlight: YES]];
-                    __weak typeof(self)weakSelf = self;
-                    weakSelf.bgImg.image = [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage *image) {
-                        weakSelf.bgImg.image = image;
-                    }];
-                }
-            }
-        } else if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type3 ) {
+        } else if (type == KMUserScenarioTypeLite_type3 ) {
             self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedStringFromTable(@"Buy Now", @"MemberCenterLocalizable", nil)];
-        } else if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type11) {
+        } else if (type == KMUserScenarioTypeLite_type5) {
             self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade", nil)];
-        } else if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type5 ||
-                   [KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type9 ||
-                   [KMMemberInfo shared].userScenarioType == KMUserScenarioTypePro_type1 ||
-                   [KMMemberInfo shared].userScenarioType == KMUserScenarioTypePro_type3 ||
-                   [KMMemberInfo shared].userScenarioType == KMUserScenarioTypePro_type4) {
+        } else if (type == KMUserScenarioTypeLite_type7) {
+            self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedStringFromTable(@"Renew now", @"MemberCenterLocalizable", nil)];
+        } else if (type == KMUserScenarioTypeLite_type9) {
             if([KMMemberInfo shared].vip_status == 2) {
                 self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedStringFromTable(@"Renew now",@"MemberCenterLocalizable", nil)];
             } else if ([KMMemberInfo shared].vip_status == 4) {
@@ -255,7 +238,13 @@ NSPopoverDelegate>
             } else {
                 self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade", nil)];
             }
-
+        } else if (type == KMUserScenarioTypeLite_type11) {
+            self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade", nil)];
+        }
+        if (type == KMUserScenarioTypeLite_type1 ||
+            type == KMUserScenarioTypeLite_type3 ||
+            type == KMUserScenarioTypeLite_type7 ||
+            type == KMUserScenarioTypeLite_type11) {
             if (KMAdvertisementManager.manager.info.topRightInfoContent != nil) {
                 if (KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject != nil) {
                     KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject;
@@ -269,71 +258,62 @@ NSPopoverDelegate>
                     }];
                 }
             }
-        } else if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type7) {
-            self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedStringFromTable(@"Renew now", @"MemberCenterLocalizable", nil)];
-        }
-        [self.button setTitleColor:[NSColor whiteColor]];
-        self.bgImg.hidden = NO;
-        self.button.hidden = NO;
-        if ([KMMemberInfo shared].userScenarioType == KMUserScenarioTypeLite_type1) {
-            if ([IAPProductsManager defaultManager].fourDevicesAllAccessPackNew12months_lite.isTrialPeriod) {
-                self.bgImg.hidden = YES;
-                self.button.hidden = YES;
-            }
-        }
-        
-        BOOL isOldSubscribed = NO;
+            
+            [self.button setTitleColor:[NSColor whiteColor]];
+            self.bgImg.hidden = NO;
+            self.button.hidden = NO;
+            
+            BOOL isOldSubscribed = NO;
 #if VERSION_FREE
 #if !VERSION_DMG
-        isOldSubscribed = (IAPProductsManager.defaultManager.allAccessPack6months_lite.isSubscribed == YES || IAPProductsManager.defaultManager.allAccessPack12months_lite.isSubscribed == YES);
+            isOldSubscribed = (IAPProductsManager.defaultManager.allAccessPack6months_lite.isSubscribed == YES || IAPProductsManager.defaultManager.allAccessPack12months_lite.isSubscribed == YES);
 #endif
 #endif
-        KMUserScenarioType type = [KMMemberInfo shared].userScenarioType;
-        // 单平台高级版永久 未登录时 也不显示升级（因为点了也得先登录），但是登录后的卡片里是有升级按钮的，可以升级成全平台高级版年订阅
-        //原来是订阅的，不需要升级，因为目前不支持订阅升级订阅这种场景
-        if(type == KMUserScenarioTypeLite_type9 ||
-           type == KMUserScenarioTypeLite_type10 ||
-           type == KMUserScenarioTypeLite_type11 ||
-           type == KMUserScenarioTypeLite_type12 ||
-           type == KMUserScenarioTypePro_type1 ||
-           type == KMUserScenarioTypePro_type2 ||
-           type == KMUserScenarioTypePro_type3 ||
-           type == KMUserScenarioTypePro_type4 ||
-           type == KMUserScenarioTypePro_type5) {
-            if ([KMMemberInfo shared].isLogin == NO || ((KMMemberInfo.shared.vip_status == 1 || KMMemberInfo.shared.vip_status == 4) && [KMMemberInfo shared].isLogin == YES && isOldSubscribed)) {
+            // 单平台高级版永久 未登录时 也不显示升级（因为点了也得先登录），但是登录后的卡片里是有升级按钮的，可以升级成全平台高级版年订阅
+            //原来是订阅的，不需要升级，因为目前不支持订阅升级订阅这种场景
+            if(type == KMUserScenarioTypeLite_type9 ||
+               type == KMUserScenarioTypeLite_type10 ||
+               type == KMUserScenarioTypeLite_type11) {
+                if([KMMemberInfo shared].isLogin == NO) { //未登录
+                    self.button.hidden = YES;
+                    self.bgImg.hidden = YES;
+                } else {
+                    if(isOldSubscribed) { //老版本付费功能是订阅包
+                        self.button.hidden = YES;
+                        self.bgImg.hidden = YES;
+                    } else {
+                        if((KMMemberInfo.shared.vip_status == 1) && [KMMemberInfo.shared.vip_paymentModel isEqualToString:@"1"]) { //会员订阅中
+                            self.button.hidden = YES;
+                            self.bgImg.hidden = YES;
+                        }
+                    }
+                }
+            } else if (type == KMUserScenarioTypeLite_type12 ||
+                       type == KMUserScenarioTypeLite_type13 ||
+                       type == KMUserScenarioTypeLite_type2 ||
+                       type == KMUserScenarioTypeLite_type4 ||
+                       type == KMUserScenarioTypeLite_type6 ||
+                       type == KMUserScenarioTypeLite_type8 ||
+                       type == KMUserScenarioTypePro_type2 ||
+                       type == KMUserScenarioTypePro_type5) {
                 self.button.hidden = YES;
                 self.bgImg.hidden = YES;
             }
-        } else if(type == KMUserScenarioTypeLite_type13) {
-            self.button.hidden = YES;
-            self.bgImg.hidden = YES;
+            
+            self.button.frame = CGRectMake(totalWidth, kbottomGap, buttonWidth, self.view.frame.size.height -2 *kbottomGap);
+            CGRect rect = self.button.frame;
+            self.bgImg.frame = rect;
+            totalWidth+=CGRectGetWidth(self.button.bounds);
+            totalWidth+=4;
         }
-        self.button.frame = CGRectMake(totalWidth, kbottomGap, buttonWidth, self.view.frame.size.height -2 *kbottomGap);
-        CGRect rect = self.button.frame;
-        self.bgImg.frame = rect;
-        totalWidth+=CGRectGetWidth(self.button.bounds);
-        totalWidth+=4;
     }
+    
     if ([KMMemberInfo shared].isLogin) {
         self.userButton.hidden = NO;
         self.userButton.frame = CGRectMake(totalWidth, 0, userImageWidth, userImageWidth);
         totalWidth += userImageWidth;
         totalWidth += 8;
     } else {
-        if (KMAdvertisementManager.manager.info.topRightInfoContent != nil) {
-            if (KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject != nil) {
-                KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject;
-                NSString *name = [KMAdvertisementModelTransition transitionLanguageWithLangeuage:info.name];
-                self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(name, nil)];
-                
-                NSURL *url = [NSURL URLWithString: [KMAdvertisementModelTransition transitionImagePathWithImage:info.image highlight: YES]];
-                __weak typeof(self)weakSelf = self;
-                weakSelf.bgImg.image = [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage *image) {
-                    weakSelf.bgImg.image = image;
-                }];
-            }
-        }
-        
         self.signUpView.hidden = NO;
         self.signUpView.frame = CGRectMake(totalWidth, 0, signUpWidth, self.view.frame.size.height);
         totalWidth+=CGRectGetWidth(self.signUpView.bounds);

PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings

@@ -110,3 +110,4 @@
 "Permanent" = "Permanent";
 "Subscription" = "Subscription";
 "expires" = "expires";
+"Free Use 1-Year AI Tools" = "Free Use 1-Year AI Tools";

PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings

@@ -106,3 +106,4 @@
 "Permanent" = "永久使用";
 "Subscription" = "订阅";
 "expires" = "到期";
+"Free Use 1-Year AI Tools" = "0元领取1年AI";

PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings

@@ -107,3 +107,4 @@
 "Permanent" = "永久使用";
 "Subscription" = "订阅";
 "expires" = "到期";
+"Free Use 1-Year AI Tools" = "0元領取1年AI";

PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -17,7 +17,7 @@ import Cocoa
     case lite_type6     // 免费版 无旧买断 全平台年订阅 (右上角导航栏按钮 - “登录领福利”)
     case lite_type7     // 免费版 无旧买断 会员到期 (右上角导航栏按钮 - “登录领福利” + 续费)
     case lite_type8     // 免费版 无旧买断 订阅未过期且取消订阅 (右上角导航栏按钮 - “登录领福利” + 续费)
-    case lite_type9     // 免费版 有旧买断 免费未试用 (右上角导航栏按钮 - “登录领福利” + “升级至Pro”)
+    case lite_type9     // 免费版 有旧买断 免费未试用+订阅过期+单平台永久 (右上角导航栏按钮 - “登录领福利” + “升级至Pro”)
     case lite_type10    // 免费版 有旧买断 免费试用中 (右上角导航栏按钮 - “登录领福利”)
     case lite_type11    // 免费版 有旧买断 试用过期或取消 (右上角导航栏按钮 - “登录领福利” + 开通会员)
     case lite_type12    // 免费版 有旧买断 订阅中 (右上角导航栏按钮 - “登录领福利”)

PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.swift

@@ -174,12 +174,14 @@ class KMEnterNewPasswordView: KMBaseXibView {
             if success {
                 self.skipSignUpView()
             } else {
-                let alert = NSAlert()
-                alert.messageText = NSLocalizedString(msg, comment: "")
-                alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-                let result = alert.runModal()
-                if (result == .alertFirstButtonReturn) {
-                    self.skipSignUpView()
+                DispatchQueue.main.async {
+                    let alert = NSAlert()
+                    alert.messageText = NSLocalizedString(msg, comment: "")
+                    alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+                    let result = alert.runModal()
+                    if (result == .alertFirstButtonReturn) {
+                        self.skipSignUpView()
+                    }
                 }
             }
         }

PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.swift

@@ -188,12 +188,14 @@ class KMForgotPasswordView: KMBaseXibView {
             if success {
                 self.skipEnterVerificationCodeView()
             } else {
-                let alert = NSAlert()
-                alert.messageText = NSLocalizedString("This email has not been registered, please log in through the account verification code, we will automatically register an account for you.", tableName: "MemberCenterLocalizable", comment: "")
-                alert.addButton(withTitle: "OK")
-                let response = alert.runModal()
-                if response == .alertFirstButtonReturn {
-                    self.skipSignUpView()
+                DispatchQueue.main.async {
+                    let alert = NSAlert()
+                    alert.messageText = NSLocalizedString("This email has not been registered, please log in through the account verification code, we will automatically register an account for you.", tableName: "MemberCenterLocalizable", comment: "")
+                    alert.addButton(withTitle: "OK")
+                    let response = alert.runModal()
+                    if response == .alertFirstButtonReturn {
+                        self.skipSignUpView()
+                    }
                 }
             }
         }

PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift

@@ -377,7 +377,7 @@ class KMSignUpView: KMBaseXibView {
                 if newValue.count <= 30 && newValue.count >= 0 {
                     self?.viewModel.passwordErrorMessage = ""
                 } else {
-                    self?.viewModel.passwordErrorMessage = NSLocalizedString("Account or password error.", tableName: "MemberCenterLocalizable", comment: "")
+                    self?.viewModel.passwordErrorMessage = NSLocalizedString("Password error.", tableName: "MemberCenterLocalizable", comment: "")
                 }
             }
             .store(in: &cancellables)

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -769,14 +769,17 @@ class KMUserInfoViewController: NSViewController {
             self.viewModel.closeAccountAction()
         }
         
-        buyNow1BoxLeftConst.constant = 0
-        buyNow2Box.isHidden = false
-        
-        //远程控制
-        if let userViewInfoContent = KMAdvertisementManager.manager.info.userViewInfoContent {
-            if userViewInfoContent.content?.isEmpty == false {
-                buyNow2Box.isHidden = true
-                buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
+        if IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == false { //没有试用过，才能显示，不然就算远程支持，功能上也不支持远程控制
+            //远程控制
+            if let userViewInfoContent = KMAdvertisementManager.manager.info.userViewInfoContent {
+                
+                buyNow1BoxLeftConst.constant = 0
+                buyNow2Box.isHidden = false
+                
+                if userViewInfoContent.content?.isEmpty == false {
+                    buyNow2Box.isHidden = true
+                    buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
+                }
             }
         }
     }

PDF Office/PDF Master/MemberCenter/ViewModel/KMSignUpViewModel.swift

@@ -236,16 +236,19 @@ class KMSignUpViewModel: ObservableObject {
             code = password
         }
         if !privacyState {
-            let alert = NSAlert()
-            alert.messageText = NSLocalizedString("Please agree and check the above agreement first.", tableName: "MemberCenterLocalizable", comment: "")
-            alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-//            alert.beginSheetModal(for: NSApp.mainWindow!)
-            let result = alert.runModal()
-            if (result == .alertFirstButtonReturn) {
-                privacyState = true
+            DispatchQueue.main.async {
+                
+                let alert = NSAlert()
+                alert.messageText = NSLocalizedString("Please agree and check the above agreement first.", tableName: "MemberCenterLocalizable", comment: "")
+                alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+                //            alert.beginSheetModal(for: NSApp.mainWindow!)
+                let result = alert.runModal()
+                if (result == .alertFirstButtonReturn) {
+                    self.privacyState = true
+                }
+                
+                callback?(nil)
             }
-            
-            callback?(nil)
             return
         }
         KMMemberCenterManager.manager.emailLogin(email: email, code: code, type: signUpState) { [weak self] success, wrapper  in
@@ -279,14 +282,16 @@ class KMSignUpViewModel: ObservableObject {
             } else {
                 if(resultDict.code == 305) {
                     if KMMemberCenterManager.manager.isConnectionAvailable() == false {
-                        let alert = NSAlert()
-                        alert.alertStyle = .critical
-                        alert.messageText = NSLocalizedString("Error Information", comment: "")
-                        alert.informativeText = NSLocalizedString("Please make sure your internet connection is available.", comment: "")
-                        alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-                        alert.runModal()
-                        
-                        callback?(false)
+                        DispatchQueue.main.async {
+                            let alert = NSAlert()
+                            alert.alertStyle = .critical
+                            alert.messageText = NSLocalizedString("Error Information", comment: "")
+                            alert.informativeText = NSLocalizedString("Please make sure your internet connection is available.", comment: "")
+                            alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+                            alert.runModal()
+                            
+                            callback?(false)
+                        }
                         return
                     }
                     KMMemberCenterManager.manager.getUserDeviceList(email: self.email) { [weak self] success, result in
@@ -303,16 +308,18 @@ class KMSignUpViewModel: ObservableObject {
                     callback?(false)
                     
                     print("错误信息：%@", msg as Any)
-                    let alert = NSAlert()
-                    alert.messageText = NSLocalizedString(msg!, comment: "")
-                    alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-                    let response = alert.runModal()
-                    if response == .alertFirstButtonReturn {
-                        if(resultDict.code == 317) {
-                            self.signUpState = .verificationCode
-                            self.countDown(type: .login, callback: nil)
-                        } else {
-                            
+                    DispatchQueue.main.async {
+                        let alert = NSAlert()
+                        alert.messageText = NSLocalizedString(msg!, comment: "")
+                        alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+                        let response = alert.runModal()
+                        if response == .alertFirstButtonReturn {
+                            if(resultDict.code == 317) {
+                                self.signUpState = .verificationCode
+                                self.countDown(type: .login, callback: nil)
+                            } else {
+                                
+                            }
                         }
                     }
                 }