【综合】序列码的流程串接

PDF Office/PDF Master/Class/Account/Controller/AccountProfileController.swift

@@ -126,7 +126,8 @@ class AccountProfileController: NSViewController {
             self.tipLabel.isHidden = false
             self.tipLabel.stringValue = String(format: NSLocalizedString("You have tried it for %d days.", comment: ""), self.model?.trialData?.triedDay ?? 0)
         } else {
-            self.tipLabel.isHidden = true
+            self.tipLabel.isHidden = false
+            self.tipLabel.stringValue = NSLocalizedString("Your trial has ended.", comment: "")
         }
         
         let isVip = model?.isVip ?? 0
@@ -224,6 +225,10 @@ class AccountProfileController: NSViewController {
                         
                         // 登出
                         VerificationManager.default().unactivateDeviceWithcomplention { status, infoDict, err in
+                            VerificationManager.default().verification {status1 , infoDict1, err1 in
+                                
+                            }
+                            
                             self?.view.window?.windowController?.km_quick_endSheet()
                             KMDataManager.ud_set("", forKey: kAccountTokenKey)
                             AccountManager.manager.isVip = false

PDF Office/PDF Master/Class/Account/View/AccountRightCellView.swift

@@ -152,7 +152,11 @@ class AccountRightCellView: NSTableCellView {
                 self.button_.title = NSLocalizedString("Cancel Subscription", comment: "")
                 self.button_.setTitleColor(NSColor(hex: "#666666"))
                 
-                self.expireDatelabel_.attributedStringValue = .init(string: NSLocalizedString("Expires:", comment: "") + expireTime)
+                if model?.license_id == 3 { // 终身
+                    self.expireDatelabel_.attributedStringValue = .init(string: NSLocalizedString("Expires:", comment: "") + NSLocalizedString("Unlimited", comment: ""))
+                } else {
+                    self.expireDatelabel_.attributedStringValue = .init(string: NSLocalizedString("Expires:", comment: "") + expireTime)
+                }
             } else if status == 2 {
                 self.button_.layer?.borderWidth = 0
                 self.button_.layer?.backgroundColor = KMAppearance.themeColor().cgColor

PDF Office/PDF Master/Class/Account/Window/AccountCenterWindowController.swift

@@ -107,6 +107,9 @@ class AccountCenterWindowController: NSWindowController {
             }
             
             VerificationManager.default().activateDevice(withInfo: ["email" : model.email]) { status, infoDict, err in
+                VerificationManager.default().verification {status1 , infoDict1, err1 in
+                    
+                }
                 let header = ["Token" : model.token ?? ""]
                 KMHTTP.OEM_POST(urlString: kURLAPI_oemGetPermissions, parameter: nil, headers: header) { success, dataModel, err in
                     if success == false {
@@ -148,6 +151,10 @@ class AccountCenterWindowController: NSWindowController {
             }
             
             VerificationManager.default().activateDevice(withInfo: ["email" : model.email]) { status, infoDict, err in
+                VerificationManager.default().verification {status1 , infoDict1, err1 in
+                    
+                }
+                
                 let header = ["Token" : model.token ?? ""]
                 KMHTTP.OEM_POST(urlString: kURLAPI_oemGetPermissions, parameter: nil, headers: header) { success, dataModel, err in
                     if success == false {

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -532,7 +532,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
             self._progressHUD(message: NSLocalizedString("Can not delete all pages.", comment: ""))
             return
         }
-        super.cutAction()
+        super.oem_cutAction()
     }
     
     override func copyAction() {
@@ -707,7 +707,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
     
     override func oem_pasteAction() {
         if (self.canPaste()) {
-            super.pasteAction()
+            super.oem_pasteAction()
             
             self.dealPdfDocumentDidEditCallback(type: .paste)
         } else {
@@ -802,7 +802,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
         }
         AccountTools.canUseAdvance { can, err in
             if can {
-                self.replaceAction()
+                self.oem_replaceAction()
                 return
             }
             KMMainThreadExecute {
@@ -820,7 +820,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
         
         self.trackEvent(type: .replace)
         
-        super.replaceAction()
+        super.oem_replaceAction()
         
         DispatchQueue.main.async {
             self.toolBar.unSelectItem(for: KMToolbarPageEditReplaceItemIdentifier)

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

@@ -673,8 +673,8 @@ static VerificationManager *__verificationManager = nil;
     
     NSMutableData *postData = [VerificationManager mutableDataWithDic:params];
     
-    //Send Request
-    NSString *urlString = [kVerificationPDFullServer stringByAppendingString:@"/oem/cancel"];
+//    Send Request
+    NSString *urlString = [kVerificationPDFullServer stringByAppendingString:@"oem/cancel"];
     
     
     NSURL *url = [NSURL URLWithString:urlString];

PDF Office/PDF Master/Class/Purchase/IAPProductsManager.m

@@ -530,9 +530,9 @@ NSString * const KMIAPSubscriptionLoadedNotification = @"KMIAPSubscriptionLoaded
 - (BOOL)isAvailableAllFunction {
 #if VERSION_DMG
     // 桌机版
-    if ([AccountManager manager].isVip) {
-        return true;
-    }
+//    if ([AccountManager manager].isVip) {
+//        return true;
+//    }
     
 //    dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 //    [AccountTools canUseAdvanceWithCallback:^(BOOL success, NSString * _Nullable err) {
@@ -575,9 +575,9 @@ NSString * const KMIAPSubscriptionLoadedNotification = @"KMIAPSubscriptionLoaded
 - (BOOL)isAvailableAdvancedPDFToOffice {
 #if VERSION_DMG
     // 桌机版
-    if ([AccountManager manager].isVip) {
-        return true;
-    }
+//    if ([AccountManager manager].isVip) {
+//        return true;
+//    }
     
     VerificationManager *tManager = [VerificationManager manager];
     BOOL tLicenseOK = NO;

PDF Office/PDF Master/Strings/ar.lproj/Localizable.strings

@@ -4797,3 +4797,8 @@
 
 "Upgrade to authorized Pro version" = "الترقية إلى الإصدار الاحترافي المعتمد";
 "Email address must be no longer than 50 characters." = "يجب ألا يتجاوز عنوان البريد الإلكتروني 50 حرفًا.";
+
+"Password only contains alphabets, numbers and special characters."="كلمة المرور تحتوي فقط على الحروف الهجائية والأرقام والأحرف الخاصة.";
+"Email address must be no longer than 50 characters."="يجب ألا يزيد عنوان البريد الإلكتروني عن 50 حرفاً.";
+"Your trial has ended."="انتهت تجربتك.";
+"Unlimited"="غير محدود";

PDF Office/PDF Master/Strings/de.lproj/Localizable.strings

@@ -3166,3 +3166,8 @@
 
 "Upgrade to authorized Pro version" = "Upgrade auf autorisierte Pro-Version";
 "Email address must be no longer than 50 characters." = "Die E-Mail-Adresse darf nicht länger als 50 Zeichen sein.";
+
+"Password only contains alphabets, numbers and special characters."="Das Passwort darf nur Buchstaben, Zahlen und Sonderzeichen enthalten.";
+"Email address must be no longer than 50 characters."="Die E-Mail-Adresse darf nicht länger als 50 Zeichen sein.";
+"Your trial has ended."="Ihre Testversion ist abgelaufen.";
+"Unlimited"="Unbegrenzt";

PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -4329,3 +4329,8 @@
 
 "Upgrade to authorized Pro version" = "Upgrade to authorized Pro version";
 "Email address must be no longer than 50 characters." = "Email address must be no longer than 50 characters.";
+
+"Password only contains alphabets, numbers and special characters."="Password only contains alphabets, numbers and special characters.";
+"Email address must be no longer than 50 characters."="Email address must be no longer than 50 characters.";
+"Your trial has ended."="Your trial has ended.";
+"Unlimited"="Unlimited";

PDF Office/PDF Master/Strings/es.lproj/Localizable.strings

@@ -3248,3 +3248,8 @@
 
 "Upgrade to authorized Pro version" = "Actualizar a la versión Pro autorizada";
 "Email address must be no longer than 50 characters." = "La dirección de correo electrónico no debe tener más de 50 caracteres.";
+
+"Password only contains alphabets, numbers and special characters."="La contraseña sólo puede contener letras, números y caracteres especiales.";
+"Email address must be no longer than 50 characters."="La dirección de correo electrónico no debe tener más de 50 caracteres.";
+"Your trial has ended."="Su prueba ha finalizado.";
+"Unlimited"="Sin límites";

PDF Office/PDF Master/Strings/fr.lproj/Localizable.strings

@@ -3128,3 +3128,8 @@
 
 "Upgrade to authorized Pro version" = "Mise à niveau vers la version Pro autorisée";
 "Email address must be no longer than 50 characters." = "L'adresse e-mail ne doit pas dépasser 50 caractères.";
+
+"Password only contains alphabets, numbers and special characters."="Le mot de passe ne doit contenir que des lettres, des chiffres et des caractères spéciaux.";
+"Email address must be no longer than 50 characters."="L'adresse électronique ne doit pas comporter plus de 50 caractères.";
+"Your trial has ended."="Votre essai est terminé.";
+"Unlimited"="Illimité";

PDF Office/PDF Master/Strings/it.lproj/Localizable.strings

@@ -3045,3 +3045,8 @@
 
 "Upgrade to authorized Pro version" = "Aggiorna alla versione Pro autorizzata";
 "Email address must be no longer than 50 characters." = "L'indirizzo email non deve superare i 50 caratteri.";
+
+"Password only contains alphabets, numbers and special characters."="La password deve contenere solo lettere, numeri e caratteri speciali.";
+"Email address must be no longer than 50 characters."="L'indirizzo e-mail non deve superare i 50 caratteri.";
+"Your trial has ended."="La tua prova è terminata.";
+"Unlimited"="Illimitato";

PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings

@@ -3323,3 +3323,8 @@
 
 "Upgrade to authorized Pro version" = "認定されたProバージョンにアップグレード";
 "Email address must be no longer than 50 characters." = "メールアドレスは50文字以内でなければなりません。";
+
+"Password only contains alphabets, numbers and special characters."="パスワードはアルファベット、数字、特殊文字のみ。";
+"Email address must be no longer than 50 characters."="メールアドレスは50文字以内で入力してください。";
+"Your trial has ended."="トライアルは終了しました。";
+"Unlimited"="無制限";

PDF Office/PDF Master/Strings/nl.lproj/Localizable.strings

@@ -3204,3 +3204,8 @@
 
 "Upgrade to authorized Pro version" = "Upgrade naar een geautoriseerde Pro-versie";
 "Email address must be no longer than 50 characters." = "Het e-mailadres mag niet langer zijn dan 50 tekens.";
+
+"Password only contains alphabets, numbers and special characters."="Wachtwoord bevat alleen alfabetten, cijfers en speciale tekens.";
+"Email address must be no longer than 50 characters."="Het e-mailadres mag niet langer zijn dan 50 tekens.";
+"Your trial has ended."="Uw proefperiode is afgelopen.";
+"Unlimited"="Onbeperkt";

PDF Office/PDF Master/Strings/pl.lproj/Localizable.strings

@@ -3260,3 +3260,8 @@
 
 "Upgrade to authorized Pro version" = "Uaktualnij do autoryzowanej wersji Pro";
 "Email address must be no longer than 50 characters." = "Adres e-mail nie może być dłuższy niż 50 znaków.";
+
+"Password only contains alphabets, numbers and special characters."="Hasło może zawierać tylko litery, cyfry i znaki specjalne.";
+"Email address must be no longer than 50 characters."="Adres e-mail nie może być dłuższy niż 50 znaków.";
+"Your trial has ended."="Twój okres próbny dobiegł końca.";
+"Unlimited"="Bez ograniczeń";

PDF Office/PDF Master/Strings/pt.lproj/Localizable.strings

@@ -4717,3 +4717,8 @@
 
 "Upgrade to authorized Pro version" = "Atualize para a versão Pro autorizada";
 "Email address must be no longer than 50 characters." = "O endereço de e-mail não deve ter mais de 50 caracteres.";
+
+"Password only contains alphabets, numbers and special characters."="A senha contém apenas alfabetos, números e caracteres especiais.";
+"Email address must be no longer than 50 characters."="O endereço de e-mail não deve ter mais de 50 caracteres.";
+"Your trial has ended."="Seu teste terminou.";
+"Unlimited"="Ilimitado";

PDF Office/PDF Master/Strings/ru.lproj/Localizable.strings

@@ -3193,3 +3193,8 @@
 
 "Upgrade to authorized Pro version" = "Обновитесь до авторизованной версии Pro";
 "Email address must be no longer than 50 characters." = "Адрес электронной почты не должен быть длиннее 50 символов.";
+
+"Password only contains alphabets, numbers and special characters."="Пароль должен содержать только алфавиты, цифры и специальные символы.";
+"Email address must be no longer than 50 characters."="Адрес электронной почты должен содержать не более 50 символов.";
+"Your trial has ended."="Ваш пробный период окончен.";
+"Unlimited"="Неограниченный";

PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -4250,3 +4250,8 @@
 
 "Upgrade to authorized Pro version" = "升级授权Pro版本";
 "Email address must be no longer than 50 characters." = "电子邮件地址不得超过 50 个字符。";
+
+"Password only contains alphabets, numbers and special characters."="密码只能包含字母、数字和特殊字符。";
+"Email address must be no longer than 50 characters."="邮箱地址不能超过 50 个字符。";
+"Your trial has ended."="试用结束。";
+"Unlimited"="不限";

PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4363,3 +4363,8 @@
 
 "Upgrade to authorized Pro version" = "升級授權Pro版本";
 "Email address must be no longer than 50 characters." = "電子郵件地址不得超過 50 個字元。";
+
+"Password only contains alphabets, numbers and special characters."="Wachtwoord bevat alleen alfabetten, cijfers en speciale tekens.";
+"Email address must be no longer than 50 characters."="Het e-mailadres mag niet langer zijn dan 50 tekens.";
+"Your trial has ended."="Uw proefperiode is afgelopen.";
+"Unlimited"="Onbeperkt";