Ver Fonte

【综合】替换官网链接、邮箱号、序列码激活参数、AI接口参数

wanjun há 8 meses atrás
pai
commit
d09f00cdf2
19 ficheiros alterados com 189 adições e 101 exclusões
  1. 1 3
      PDF Office/PDF Master/Class/AIInfo/KMAIRequestServerManager.swift
  2. 28 28
      PDF Office/PDF Master/Class/Common/OC/EmailSubscription/KMEmailSubWindowController.m
  3. 2 2
      PDF Office/PDF Master/Class/Common/Tools/KMTools.swift
  4. 1 1
      PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift
  5. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/AccountException/View/KMAccountExceptionView.swift
  6. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Manager/KMRequestServerManager.swift
  7. 1 1
      PDF Office/PDF Master/Class/PDFWindowController/Form/KMFormActionButtonPopWindowController.xib
  8. 1 1
      PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/KMOutlineEditViewController.swift
  9. 2 2
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationSelectLinkViewController.swift
  10. 6 6
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationSelectLinkViewController.xib
  11. 1 1
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationButtonOptionsViewController.swift
  12. 2 2
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayThemeCollectionViewItem.xib
  13. 28 28
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.swift
  14. 2 1
      PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.xib
  15. 91 2
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationActivateViewController.m
  16. 15 15
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationTrialViewController.m
  17. 1 1
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m
  18. 2 2
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/AIInfoManager.m
  19. 3 3
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.h

+ 1 - 3
PDF Office/PDF Master/Class/AIInfo/KMAIRequestServerManager.swift

@@ -105,9 +105,7 @@ class ResultWrapper: NSObject {
     }
     
     private func app_name() -> String {
-        var bundleID: String!
-        bundleID = Bundle.main.object(forInfoDictionaryKey: "CFBundleIdentifier") as! String
-        return bundleID;
+        return "com.cisdem.pdfmaster.mac"
     }
     
     func downloadFile(filePath: String, downFileName: String, toPath: String, complete: @escaping KMRequestServerComplete) {

+ 28 - 28
PDF Office/PDF Master/Class/Common/OC/EmailSubscription/KMEmailSubWindowController.m

@@ -88,34 +88,34 @@
 }
 
 - (void)subscriptionWithEmail:(NSString *)email completionHandler:(void (^)(NSError *error))handler {
-    NSString *string = @"https://store.pdfreaderpro.com/api/member/subscribe";
-    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:string]];
-    [request setHTTPMethod:@"POST"];
-    [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
-    
-    NSDictionary *body = @{@"member" : @{@"email" : email}};
-    [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:NSJSONWritingPrettyPrinted error:nil]];
-
-    NSURLSession *session = [NSURLSession sharedSession];
-    NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                            completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-                                                if (!error) {
-                                                    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data
-                                                                                                        options:NSJSONReadingMutableContainers error:nil];
-                                                    NSDictionary *dataDic = dic[@"member"];
-                                                    if (dataDic) {
-                                                        
-                                                    } else {
-                                                        error = [NSError errorWithDomain:@"" code:0 userInfo:dic];
-                                                    }
-                                                }
-                                                dispatch_async(dispatch_get_main_queue(), ^{
-                                                    if (handler) {
-                                                        handler(error);
-                                                    }
-                                                });
-                                            }];
-    [task resume];
+//    NSString *string = @"https://store.pdfreaderpro.com/api/member/subscribe";
+//    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:string]];
+//    [request setHTTPMethod:@"POST"];
+//    [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+//    
+//    NSDictionary *body = @{@"member" : @{@"email" : email}};
+//    [request setHTTPBody:[NSJSONSerialization dataWithJSONObject:body options:NSJSONWritingPrettyPrinted error:nil]];
+//
+//    NSURLSession *session = [NSURLSession sharedSession];
+//    NSURLSessionDataTask *task = [session dataTaskWithRequest:request
+//                                            completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+//                                                if (!error) {
+//                                                    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data
+//                                                                                                        options:NSJSONReadingMutableContainers error:nil];
+//                                                    NSDictionary *dataDic = dic[@"member"];
+//                                                    if (dataDic) {
+//                                                        
+//                                                    } else {
+//                                                        error = [NSError errorWithDomain:@"" code:0 userInfo:dic];
+//                                                    }
+//                                                }
+//                                                dispatch_async(dispatch_get_main_queue(), ^{
+//                                                    if (handler) {
+//                                                        handler(error);
+//                                                    }
+//                                                });
+//                                            }];
+//    [task resume];
 }
 
 #pragma mark - Public Methods

+ 2 - 2
PDF Office/PDF Master/Class/Common/Tools/KMTools.swift

@@ -344,7 +344,7 @@ extension KMTools {
             tStrUrl = "https://apps.apple.com/developer/pdf-technologies-inc/id1263126485"
         }
     #if VERSION_DMG
-        tStrUrl = "https://www.pdfreaderpro.com/product?utm_source=MacAppDmg&utm_campaign=ProductLink&utm_medium=PdfProduct"
+        tStrUrl = "https://www.cisdem.com/pdfmaster.html"
     #endif
         
         KMTools.openURL(urlString: tStrUrl)
@@ -355,7 +355,7 @@ extension KMTools {
         var tStrUrl: String?
     #if VERSION_FREE
     #if VERSION_DMG
-        tStrUrl = "https://www.pdfreaderpro.com/templates?utm_source=MacAppDmg&utm_campaign=TemplatesLink&utm_medium=PdfTemplates"
+        tStrUrl = "https://www.cisdem.com/pdfmaster.html"
     #else
         tStrUrl = "https://www.pdfreaderpro.com/templates?utm_source=MacAppLite&utm_campaign=TemplatesLink&utm_medium=PdfTemplates"
     #endif

+ 1 - 1
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -124,7 +124,7 @@ import Cocoa
         let kDMGFirstInstallKey = "DMGFirstInstallKey"
         if KMDataManager.ud_object(forKey: kDMGFirstInstallKey) == nil {
             KMDataManager.ud_set("Show", forKey: kDMGFirstInstallKey)
-            KMTools.openURL(urlString: "http://www.pdfreaderpro.com/thank-you-for-installation")
+            KMTools.openURL(urlString: "https://www.cisdem.com/pdfmaster-mac/buy.html")
         }
 #else
 //    [self loadAIInfo];

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/AccountException/View/KMAccountExceptionView.swift

@@ -94,7 +94,7 @@ extension KMAccountExceptionView: NSTextViewDelegate {
 //            guard let callBack = reSendAction else { return true }
 //            textView.isSelectable = false
 //            callBack(self, textView)
-            NSWorkspace.shared.open(URL(string: "https://www.pdfreaderpro.com/contact")!)
+            NSWorkspace.shared.open(URL(string: "https://www.cisdem.com/support.html")!)
         }
         return true
     }

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Manager/KMRequestServerManager.swift

@@ -905,7 +905,7 @@ extension KMRequestServerManager {
                             //                    KMMailHelper.newEmail(withContacts: "support@cisdem.com", andSubjects: "")
                             //                    NSWorkspace.shared.launchApplication("Mailto:support@cisdem.com")
                             //                    NSWorkspace.shared.open(URL(string: "mailto:support@cisdem.com")!)
-                            NSWorkspace.shared.open(URL(string: "https://www.pdfreaderpro.com/contact")!)
+                            NSWorkspace.shared.open(URL(string: "https://www.cisdem.com/support.html")!)
                             //                    let service = NSSharingService(named: NSSharingService.Name.composeEmail)
                             //                    service?.recipients = ["support@cisdem.com"]
                             //                    service?.subject = "Test Mail"

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/Form/KMFormActionButtonPopWindowController.xib

@@ -148,7 +148,7 @@ DQ
                     </textField>
                     <textField focusRingType="none" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aQw-DO-oGy">
                         <rect key="frame" x="40" y="85" width="320" height="21"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="https://www.pdfreaderpro.com" drawsBackground="YES" id="fpF-jv-uu6">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="https://www.cisdem.com/pdfmaster.html" drawsBackground="YES" id="fpF-jv-uu6">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/KMOutlineEditViewController.swift

@@ -53,7 +53,7 @@ class KMOutlineEditViewController: NSViewController {
         self.outlineNameLabel.stringValue = "\(NSLocalizedString("Label", comment: ""))"
         self.pageButton.title = "\(NSLocalizedString("Page", comment: ""))"
         self.urlButton.title = "\(NSLocalizedString("URL:", comment: ""))"
-        self.outlineURLTextField.placeholderString = "\(NSLocalizedString("https://www.pdfreaderpro.com", comment: ""))"
+        self.outlineURLTextField.placeholderString = "\(NSLocalizedString("https://www.cisdem.com/pdfmaster.html", comment: ""))"
         self.mailButton.title = "Email:"
         self.mailAddressTextField.placeholderString = "\(NSLocalizedString("support@cisdem.com", comment: ""))"
         self.outlineNameTextView.string = self.outline?.label ?? ""

+ 2 - 2
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationSelectLinkViewController.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-let URLPlaceholder = "https://www.pdfreaderpro.com"
+let URLPlaceholder = "https://www.cisdem.com/pdfmaster.html"
 let EmailPlaceholder = "support@cisdem.com"
 
 enum KMAnnotationLinkType: UInt {
@@ -320,7 +320,7 @@ enum KMAnnotationLinkType: UInt {
         urlLabel.stringValue = NSLocalizedString("URL:", comment: "")
         urlLabel.textColor = KMAppearance.Layout.h1Color()
 
-        inputUrlTextField.placeholderString = "https://www.pdfreaderpro.com"
+        inputUrlTextField.placeholderString = "https://www.cisdem.com/pdfmaster.html"
         
         if let annotationURL = annotation?.url() {
             var urlString = annotationURL.fileURL.absoluteString

+ 6 - 6
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationSelectLinkViewController.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMAnnotationSelectLinkViewController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMAnnotationSelectLinkViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="allPageLabel" destination="DS4-Pe-jrX" id="7Da-9g-Ten"/>
                 <outlet property="contentBox" destination="W3X-RT-epC" id="70S-OH-CA9"/>
@@ -128,7 +128,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="MoX-Dg-OAo">
                                 <rect key="frame" x="16" y="393" width="241" height="69"/>
                                 <subviews>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="6" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iuu-mN-h5Y" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="6" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iuu-mN-h5Y" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="64" height="69"/>
                                         <view key="contentView" id="eNo-TU-Gfr">
                                             <rect key="frame" x="0.0" y="0.0" width="64" height="69"/>
@@ -164,7 +164,7 @@
                                             <constraint firstAttribute="width" constant="64" id="7QR-LL-F0H"/>
                                         </constraints>
                                     </box>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="6" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="8T1-6p-sqt" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="6" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="8T1-6p-sqt" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                         <rect key="frame" x="89" y="0.0" width="64" height="69"/>
                                         <view key="contentView" id="267-ww-qqI">
                                             <rect key="frame" x="0.0" y="0.0" width="64" height="69"/>
@@ -199,7 +199,7 @@
                                             <constraint firstAttribute="width" constant="64" id="ZPb-39-AE1"/>
                                         </constraints>
                                     </box>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="6" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Eqj-rm-lmf" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="6" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Eqj-rm-lmf" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                         <rect key="frame" x="177" y="0.0" width="64" height="69"/>
                                         <view key="contentView" id="Ha0-A8-3Kn">
                                             <rect key="frame" x="0.0" y="0.0" width="64" height="69"/>

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationButtonOptionsViewController.swift

@@ -8,7 +8,7 @@
 import Cocoa
 
 private let SendEmail = "support@cisdem.com"
-private let LinkHyperlink = "https://www.pdfreaderpro.com"
+private let LinkHyperlink = "https://www.cisdem.com/pdfmaster.html"
 
 @objcMembers class KMAnnotationButtonOptionsViewController: NSViewController {
     

+ 2 - 2
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayThemeCollectionViewItem.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 28 - 28
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.swift

@@ -271,26 +271,26 @@ import Cocoa
             self.nameTextFieldView.layer?.backgroundColor = NSColor(red: 57.0/255.0, green: 58.0/255.0, blue: 70.0/255.0, alpha: 1).cgColor
             self.emailTextFieldView.layer?.backgroundColor = NSColor(red: 57.0/255.0, green: 58.0/255.0, blue: 70.0/255.0, alpha: 1).cgColor
             
-            let stringValue : String  = NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: "")
-            let attributedString: NSMutableAttributedString = NSMutableAttributedString(string: NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: ""))
-            let privacyPolicy : String = NSLocalizedString("Privacy Policy.", comment: "")
-            
-            let allRange = (stringValue as NSString).range(of: stringValue)
-            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.Layout.w70Color()], range: allRange)
-            attributedString.addAttributes([NSAttributedString.Key.font :NSFont(name: "SFProText-Regular", size: 12.0) as Any], range: allRange)
-            
-            let urlString : String = "https://www.pdfreaderpro.com/privacy-policy"
-            let encodedURLString : String = urlString.addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)!
-            let linkRange = (stringValue as NSString).range(of: privacyPolicy)
-            attributedString.addAttribute(.link, value: NSURL(string: encodedURLString)!, range: linkRange)
-            attributedString.addAttribute(.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: linkRange)
+//            let stringValue : String  = NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: "")
+//            let attributedString: NSMutableAttributedString = NSMutableAttributedString(string: NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: ""))
+//            let privacyPolicy : String = NSLocalizedString("Privacy Policy.", comment: "")
+//            
+//            let allRange = (stringValue as NSString).range(of: stringValue)
+//            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.Layout.w70Color()], range: allRange)
+//            attributedString.addAttributes([NSAttributedString.Key.font :NSFont(name: "SFProText-Regular", size: 12.0) as Any], range: allRange)
+//            
+//            let urlString : String = "https://www.pdfreaderpro.com/privacy-policy"
+//            let encodedURLString : String = urlString.addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)!
+//            let linkRange = (stringValue as NSString).range(of: privacyPolicy)
+//            attributedString.addAttribute(.link, value: NSURL(string: encodedURLString)!, range: linkRange)
+//            attributedString.addAttribute(.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: linkRange)
             
             self.bottomTextView.linkTextAttributes = [
                 NSAttributedString.Key.foregroundColor: KMAppearance.Interactive.a0Color(),
                 NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
             ]
             
-            self.bottomTextView.textStorage?.setAttributedString(attributedString)
+//            self.bottomTextView.textStorage?.setAttributedString(attributedString)
             self.bottomTextView.isEditable = false // TextView不可编辑
             self.bottomTextView.isSelectable = true // TextView可选择
             self.bottomTextView.sizeToFit()
@@ -343,19 +343,19 @@ import Cocoa
             self.nameTextFieldView.layer?.backgroundColor = NSColor(red: 235.0/255.0, green: 236.0/255.0, blue: 250.0/255.0, alpha: 1).cgColor
             self.emailTextFieldView.layer?.backgroundColor = NSColor(red: 235.0/255.0, green: 236.0/255.0, blue: 250.0/255.0, alpha: 1).cgColor
             
-            let stringValue : String  = NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: "")
-            let attributedString: NSMutableAttributedString = NSMutableAttributedString(string: NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: ""))
-            let privacyPolicy : String = NSLocalizedString("Privacy Policy.", comment: "")
-            
-            let urlString : String = "https://www.pdfreaderpro.com/privacy-policy"
-            let encodedURLString : String = urlString.addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)!
-            let linkRange = (stringValue as NSString).range(of: privacyPolicy)
-            attributedString.addAttribute(NSAttributedString.Key.link, value: NSURL(string: encodedURLString)!, range: linkRange)
-            attributedString.addAttribute(NSAttributedString.Key.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: linkRange)
-            
-            let allRange = (stringValue as NSString).range(of: stringValue)
-            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.Layout.h1Color()], range: allRange)
-            attributedString.addAttributes([NSAttributedString.Key.font :NSFont(name: "SFProText-Regular", size: 12.0) as Any], range: allRange)
+//            let stringValue : String  = NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: "")
+//            let attributedString: NSMutableAttributedString = NSMutableAttributedString(string: NSLocalizedString("By applying for free trial, you confirm that you agree this Privacy Policy.", comment: ""))
+//            let privacyPolicy : String = NSLocalizedString("Privacy Policy.", comment: "")
+//            
+//            let urlString : String = "https://www.pdfreaderpro.com/privacy-policy"
+//            let encodedURLString : String = urlString.addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)!
+//            let linkRange = (stringValue as NSString).range(of: privacyPolicy)
+//            attributedString.addAttribute(NSAttributedString.Key.link, value: NSURL(string: encodedURLString)!, range: linkRange)
+//            attributedString.addAttribute(NSAttributedString.Key.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: linkRange)
+//            
+//            let allRange = (stringValue as NSString).range(of: stringValue)
+//            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : KMAppearance.Layout.h1Color()], range: allRange)
+//            attributedString.addAttributes([NSAttributedString.Key.font :NSFont(name: "SFProText-Regular", size: 12.0) as Any], range: allRange)
             
             // 设置悬停时链接文本颜色
 //            let hoverColor = NSColor.blue
@@ -366,7 +366,7 @@ import Cocoa
                 NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
             ]
             
-            self.bottomTextView.textStorage?.setAttributedString(attributedString)
+//            self.bottomTextView.textStorage?.setAttributedString(attributedString)
             self.bottomTextView.isEditable = false // TextView不可编辑
             self.bottomTextView.isSelectable = true // TextView可选择
             self.bottomTextView.sizeToFit()

+ 2 - 1
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseFirstTrialWindowController.xib

@@ -50,7 +50,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="850" height="508"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
             <value key="minSize" type="size" width="850" height="508"/>
             <value key="maxSize" type="size" width="850" height="508"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -346,6 +346,7 @@
                                                     <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <size key="minSize" width="404" height="68"/>
                                                     <size key="maxSize" width="404" height="10000000"/>
+                                                    <color key="insertionPointColor" name="textInsertionPointColor" catalog="System" colorSpace="catalog"/>
                                                 </textView>
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>

+ 91 - 2
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationActivateViewController.m

@@ -7,6 +7,7 @@
 
 #import "KMVerificationActivateViewController.h"
 #import <PDF_Reader_Pro-Swift.h>
+#import "GBDeviceInfo.h"
 
 @interface KMVerificationActivateViewController ()
 
@@ -148,8 +149,96 @@
 }
 
 - (IBAction)clickHereButtonAction:(id)sender {
-    NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/license_retrieval"];
-    [[NSWorkspace sharedWorkspace] openURL:url];
+    unsigned major, minor, bugFix;
+    [self getSystemVersionMajor:&major minor:&minor bugFix:&bugFix];
+    NSString *versionString = [NSString stringWithFormat:@"%@ - %u.%u.%u", [GBDeviceInfo deviceInfo].rawSystemInfoString, major, minor, bugFix];
+
+    //application version (use short version preferentially)
+    NSString *tAppVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
+    if ([tAppVersion length] < 1)
+    {
+        tAppVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
+    }
+    
+    NSString* subjects = [[self getAppNameForSupportEmail] stringByAppendingFormat:NSLocalizedString(@" - %@;Feedback;%@", nil) ,tAppVersion,versionString];
+    [KMMailHelper newEmailWithContacts:@"support@cisdem.com" andSubjects:subjects];
+}
+
+- (NSString *)getAppNameForSupportEmail
+{
+    NSString *tAppName = @"Cisdem PDFMaster";
+    
+    // 桌机版
+    VerificationManager *tManager = [VerificationManager manager];
+    switch ([tManager status]) {
+        case ActivityStatusTrial:
+            tAppName = [tAppName stringByAppendingString:@" Trial"];
+            break;
+            
+        case ActivityStatusVerification:
+            tAppName = [tAppName stringByAppendingString:@" Verification"];
+            break;
+            
+        case ActivityStatusTrialExpire:
+            tAppName = [tAppName stringByAppendingString:@" TrialExpire"];
+            break;
+            
+        case ActivityStatusVerifExpire:
+            tAppName = [tAppName stringByAppendingString:@" VerifExpire"];
+            break;
+            
+        default:
+            break;
+    }
+    
+    return tAppName;
+}
+
+- (void)getSystemVersionMajor:(unsigned *)major
+                        minor:(unsigned *)minor
+                       bugFix:(unsigned *)bugFix;
+{
+    OSErr err;
+    SInt32 systemVersion, versionMajor, versionMinor, versionBugFix;
+    
+    if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)]) {
+        NSOperatingSystemVersion osSystemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+        
+        *major = (unsigned)osSystemVersion.majorVersion;
+        *minor = (unsigned)osSystemVersion.minorVersion;
+        *bugFix = (unsigned)osSystemVersion.patchVersion;
+        
+        return;
+    } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        if ((err = Gestalt(gestaltSystemVersion, &systemVersion)) != noErr) goto fail;
+        if (systemVersion < 0x1040)
+        {
+            if (major) *major = ((systemVersion & 0xF000) >> 12) * 10 +
+                ((systemVersion & 0x0F00) >> 8);
+            if (minor) *minor = (systemVersion & 0x00F0) >> 4;
+            if (bugFix) *bugFix = (systemVersion & 0x000F);
+        }
+        else
+        {
+            if ((err = Gestalt(gestaltSystemVersionMajor, &versionMajor)) != noErr) goto fail;
+            if ((err = Gestalt(gestaltSystemVersionMinor, &versionMinor)) != noErr) goto fail;
+            if ((err = Gestalt(gestaltSystemVersionBugFix, &versionBugFix)) != noErr) goto fail;
+            if (major) *major = versionMajor;
+            if (minor) *minor = versionMinor;
+            if (bugFix) *bugFix = versionBugFix;
+        }
+        
+        return;
+#pragma clang diagnostic pop
+    }
+    
+fail:
+    NSLog(@"Unable to obtain system version: %ld", (long)err);
+    if (major) *major = 10;
+    if (minor) *minor = 0;
+    if (bugFix) *bugFix = 0;
 }
 
 - (void)setEnabled:(BOOL)enabled {

+ 15 - 15
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationTrialViewController.m

@@ -81,21 +81,21 @@
     self.licenseButton.title = NSLocalizedString(@"Enter License Number", nil);
     self.continueButton.title = NSLocalizedString(@"Activate", nil);
     
-     NSString * str1 = NSLocalizedString(@"Privacy Policy",nil);
-     NSString * str = [NSString stringWithFormat:NSLocalizedString(@"By clicking the buttons below you confirm that you have read our %@.", nil),str1];
-     NSRange range1 = [str rangeOfString:str1];
-    NSFont  * font = [NSFont systemFontOfSize:11.0];
-    NSMutableAttributedString *mastring = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSFontAttributeName:font}];
-    CGSize size = [self sizeOfString:str witFontSize:font];
-    self.textViewHeight.constant = size.height;
-    
-    [mastring addAttribute:NSForegroundColorAttributeName value:[NSColor textColor] range:NSMakeRange(0, str.length)];
-    [mastring addAttribute:NSForegroundColorAttributeName value:[NSColor colorWithRed:0 green:122.0/255.0 blue:1.0 alpha:1.0] range:range1];
-    
-    NSString *valueString1 = [[NSString stringWithFormat:@"%@",@"https://www.pdfreaderpro.com/privacy-policy"] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
-    
-    [mastring addAttribute:NSLinkAttributeName value:valueString1 range:range1];
-    [self.accoutTextView.textStorage appendAttributedString:mastring];
+//     NSString * str1 = NSLocalizedString(@"Privacy Policy",nil);
+//     NSString * str = [NSString stringWithFormat:NSLocalizedString(@"By clicking the buttons below you confirm that you have read our %@.", nil),str1];
+//     NSRange range1 = [str rangeOfString:str1];
+//    NSFont  * font = [NSFont systemFontOfSize:11.0];
+//    NSMutableAttributedString *mastring = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSFontAttributeName:font}];
+//    CGSize size = [self sizeOfString:str witFontSize:font];
+//    self.textViewHeight.constant = size.height;
+//    
+//    [mastring addAttribute:NSForegroundColorAttributeName value:[NSColor textColor] range:NSMakeRange(0, str.length)];
+//    [mastring addAttribute:NSForegroundColorAttributeName value:[NSColor colorWithRed:0 green:122.0/255.0 blue:1.0 alpha:1.0] range:range1];
+//    
+//    NSString *valueString1 = [[NSString stringWithFormat:@"%@",@"https://www.pdfreaderpro.com/privacy-policy"] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
+//    
+//    [mastring addAttribute:NSLinkAttributeName value:valueString1 range:range1];
+//    [self.accoutTextView.textStorage appendAttributedString:mastring];
     [self.accoutTextView setAlignment:NSTextAlignmentCenter];
     
     self.continueButtonLayer = [CALayer layer];

+ 1 - 1
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m

@@ -787,7 +787,7 @@ static KMVerificationWindowController *_currentWindowController = nil;
 
 - (void)accessryBtnClicked:(NSButton *)btn {
     
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.pdfreaderpro.com/mac/help/activate-license-code-mac"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.cisdem.com/pdfmaster-mac/faqs.html"]];
 }
 
 

+ 2 - 2
PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/AIInfoManager.m

@@ -53,7 +53,7 @@ static AIInfoManager *__Manager = nil;
 
 #pragma mark - Setter
 - (NSString *)bundleIdentify {
-    return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"]?:@"";
+    return @"com.cisdem.pdfmaster.mac";
 }
 
 - (NSString *)udid {
@@ -113,7 +113,7 @@ static AIInfoManager *__Manager = nil;
     @{
             //激活信息
             @"subscription":@{
-                @"app_code":@"com.brother.pdfreaderpro.ai",
+                @"app_code":@"com.cisdem.pdfmaster.ai",
 #if VERSION_DMG
                 @"cdkey":info[@"cdkey"]?:@"",
 #else

+ 3 - 3
PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.h

@@ -22,9 +22,9 @@
 
 #else
 
-#define kVerificationServer         @"https://store.pdfreaderpro.com/"
-#define kWebServerLink              NSLocalizedString(@"http://www.pdfreaderpro.com/store", nil)
-#define kAIStoreServerLink          @"https://www.pdfreaderpro.com/ai-pdf"
+#define kVerificationServer         @"https://www.cisdem.com/pdfmaster.html"
+#define kWebServerLink              NSLocalizedString(@"https://www.cisdem.com/pdfmaster-mac/buy.html", nil)
+#define kAIStoreServerLink          @"https://www.cisdem.com/pdfmaster-mac/buy.html"
 
 #endif