【综合】试用状态不允许二次激活， 隐私条款富文本兼容

PDF Office/PDF Master/AppDelegate.swift

@@ -662,7 +662,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
             if status == ActivityStatusVerifExpire {
                 let vc = KMVerificationWindowController.verification(with: .activateExpired)
                 vc?.showWindow(nil)
-            } else if status == ActivityStatusVerification {
+            } else if status == ActivityStatusVerification ||
+                        status == ActivityStatusTrial {
                 let vc = KMVerificationWindowController.verification(with: .info)
                 vc?.showWindow(nil)
             } else {

PDF Office/PDF Master/Class/Home/View/HomeContentView/History/KMHomeHistoryListView.swift

@@ -54,6 +54,9 @@ class KMHomeHistoryListView: KMBaseXibView {
         self.collectionView.register(KMHomeHistoryCollectionItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMHomeHistoryCollectionItem"))
         
 //        self.backgroundColor(KMAppearance.Layout.l0Color())
+        
+        self.wantsLayer = true
+        self.layer?.masksToBounds = true
     }
     
     override func reloadData() {

PDF Office/PDF Master/Class/Home/View/HomeContentView/History/KMHomeHistoryListView.xib

@@ -1,12 +1,12 @@
 <?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>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeHistoryListView" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeHistoryListView" customModule="LynxPDF_Editor" customModuleProvider="target">
             <connections>
                 <outlet property="collectionView" destination="2YZ-04-yn6" id="VrD-Wg-TzA"/>
                 <outlet property="noFileView" destination="iBC-yQ-otM" id="uxx-UI-Pc1"/>
@@ -39,12 +39,12 @@
                         <rect key="frame" x="-100" y="-100" width="233" height="15"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="xme-h7-eh8" customClass="KMToolSetScroller" customModule="PDF_Master" customModuleProvider="target">
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="xme-h7-eh8" customClass="KMToolSetScroller" customModule="LynxPDF_Editor" customModuleProvider="target">
                         <rect key="frame" x="-100" y="-100" width="15" height="143"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                 </scrollView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="iBC-yQ-otM" customClass="KMHomeNOFileView" customModule="PDF_Master" customModuleProvider="target">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="iBC-yQ-otM" customClass="KMHomeNOFileView" customModule="LynxPDF_Editor" customModuleProvider="target">
                     <rect key="frame" x="110" y="29" width="260" height="215"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="260" id="OgI-EC-ZmJ"/>
@@ -58,7 +58,7 @@
                 <constraint firstAttribute="bottom" secondItem="rQW-DN-cJx" secondAttribute="bottom" id="bOt-kl-Tq1"/>
                 <constraint firstItem="rQW-DN-cJx" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="d0j-Zg-yIC"/>
                 <constraint firstItem="iBC-yQ-otM" firstAttribute="centerX" secondItem="c22-O7-iKe" secondAttribute="centerX" id="e18-fE-7wC"/>
-                <constraint firstItem="iBC-yQ-otM" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="pFz-6o-Ql5"/>
+                <constraint firstItem="iBC-yQ-otM" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="h8Q-SV-cYd"/>
             </constraints>
             <point key="canvasLocation" x="-146" y="54"/>
         </customView>

PDF Office/PDF Master/Class/Home/View/HomeContentView/KMHomeContentView.xib

@@ -142,6 +142,9 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="lCh-WA-G58">
                                         <rect key="frame" x="0.0" y="0.0" width="566" height="180"/>
                                         <subviews>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="wMw-AS-5yG" customClass="KMHomeHistoryListView" customModule="LynxPDF_Editor" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="0.0" width="566" height="156"/>
+                                            </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Q84-po-tiv">
                                                 <rect key="frame" x="0.0" y="156" width="566" height="24"/>
                                                 <subviews>
@@ -217,9 +220,6 @@
                                                     <constraint firstItem="mDv-HL-Jso" firstAttribute="leading" secondItem="oce-zR-GCX" secondAttribute="trailing" constant="20" id="soy-3d-rtd"/>
                                                 </constraints>
                                             </customView>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="wMw-AS-5yG" customClass="KMHomeHistoryListView" customModule="LynxPDF_Editor" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="566" height="156"/>
-                                            </customView>
                                         </subviews>
                                         <constraints>
                                             <constraint firstItem="wMw-AS-5yG" firstAttribute="top" secondItem="Q84-po-tiv" secondAttribute="bottom" id="9Vd-no-qV4"/>

PDF Office/PDF Master/Class/Home/View/HomeContentView/NoFileView/KMHomeNOFileView.xib

@@ -1,12 +1,12 @@
 <?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>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeNOFileView" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeNOFileView" customModule="LynxPDF_Editor" customModuleProvider="target">
             <connections>
                 <outlet property="subtitleLabel" destination="1Gc-Xd-aZe" id="pwC-sc-jJr"/>
                 <outlet property="titleLabel" destination="EpA-iG-2fX" id="oUP-TK-acF"/>

PDF Office/PDF Master/Class/Purchase/DMG/FreeTrialApplyWindowController.swift

@@ -135,12 +135,17 @@ class FreeTrialApplyWindowController: NSWindowController {
             
             attributedString.addAttributes([NSAttributedString.Key.foregroundColor : NSColor(red: 136/255, green: 140/255, blue: 148/255, alpha: 1)],
                                            range: NSRange(location: 0, length: privacyString.count))
-            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : NSColor(red: 30/255, green: 179/255, blue: 249/255, alpha: 1),
-                                            NSAttributedString.Key.link : kAPPPrivacyPolicyURL],
-                                           range: privacyString.nsRange(from: privacyRange!)!)
-            attributedString.addAttributes([NSAttributedString.Key.foregroundColor : NSColor(red: 30/255, green: 179/255, blue: 249/255, alpha: 1),
-                                            NSAttributedString.Key.link : kAPPTermServiceURL],
-                                           range: privacyString.nsRange(from: termRange!)!)
+            if privacyRange != nil {
+                attributedString.addAttributes([NSAttributedString.Key.foregroundColor : NSColor(red: 30/255, green: 179/255, blue: 249/255, alpha: 1),
+                                                NSAttributedString.Key.link : kAPPPrivacyPolicyURL],
+                                               range: privacyString.nsRange(from: privacyRange!)!)
+            }
+            if termRange != nil {
+                attributedString.addAttributes([NSAttributedString.Key.foregroundColor : NSColor(red: 30/255, green: 179/255, blue: 249/255, alpha: 1),
+                                                NSAttributedString.Key.link : kAPPTermServiceURL],
+                                               range: privacyString.nsRange(from: termRange!)!)
+            }
+            
             attributedString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: privacyString.count))
             self.privacyPolicyTextView.textStorage?.setAttributedString(attributedString)
             self.privacyPolicyTextView.delegate = self

PDF Office/PDF Master/Class/Purchase/DMG/KMUpgradeWindowController.swift

@@ -190,11 +190,20 @@ class KMUpgradeWindowController: NSWindowController {
     @IBAction func enterlicenseAction(_ sender: Any) {
         self.close()
         
-        let vc = KMVerificationWindowController.verification(with:.activate)
-        vc?.callback = { [weak self] in
-
+        if (IAPProductsManager.default().isAvailableAllFunction()) {
+            let vc = KMVerificationWindowController.verification(with:.info)
+            vc?.callback = { [weak self] in
+                
+            }
+            vc?.showWindow(nil)
+        } else {
+            
+            let vc = KMVerificationWindowController.verification(with:.activate)
+            vc?.callback = { [weak self] in
+                
+            }
+            vc?.showWindow(nil)
         }
-        vc?.showWindow(nil)
         
     }
     
@@ -213,6 +222,12 @@ class KMUpgradeWindowController: NSWindowController {
             self.refreshViewColor()
         }
     }
+    
+    override func showWindow(_ sender: Any?) {
+        super.showWindow(sender)
+        
+        self.window?.center()
+    }
 }
 
 class UpgradeGradientView: NSView {

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMRepeatVerifyExpireController.xib

@@ -75,7 +75,7 @@
                                 <constraint firstItem="Ifr-zo-1iz" firstAttribute="top" secondItem="rN3-F5-et6" secondAttribute="bottom" constant="12" id="yO4-a2-WiZ"/>
                             </constraints>
                         </customView>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uOA-T6-AMu" customClass="KMCustomButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uOA-T6-AMu" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                             <rect key="frame" x="20" y="245" width="136" height="32"/>
                             <buttonCell key="cell" type="bevel" title="Enter the License" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="ZMi-Dz-nvS">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -89,7 +89,7 @@
                                 <action selector="btnAction:" target="-2" id="Ann-pA-iaP"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KEc-nc-fNO" customClass="KMCustomButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KEc-nc-fNO" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                             <rect key="frame" x="420" y="245" width="120" height="32"/>
                             <buttonCell key="cell" type="bevel" title="Purchase" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="PIm-Xf-5Hg">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -106,7 +106,7 @@ DQ
                                 <action selector="btnAction:" target="-2" id="Kom-ac-6Fm"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cqf-oh-ZSz" customClass="KMCustomButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cqf-oh-ZSz" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                             <rect key="frame" x="292" y="245" width="120" height="32"/>
                             <buttonCell key="cell" type="bevel" title="Later" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="YjC-2f-jOj">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationInfoViewController.xib

@@ -109,7 +109,7 @@
                     </view>
                     <color key="fillColor" name="KMColor_Interactive_M0"/>
                 </box>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vuU-Wl-nwe" customClass="KMCustomButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vuU-Wl-nwe" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                     <rect key="frame" x="20" y="46" width="326" height="36"/>
                     <buttonCell key="cell" type="bevel" title="Continue" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="gho-Sr-o77">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>