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

PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.swift

@@ -57,19 +57,19 @@ class KMConvertCollectionViewHeader: KMBaseXibView{
         super.mouseUp(with: event)
         let point = event.locationInWindow
         let newPoint = convert(point, from: nil)
-//        if let data = self.containerView?.frame.contains(newPoint), data {
-//            if !IAPProductsManager.defaultManager().isAvailableAdvancedPDFToOffice {
-//                self.convertHeaderClickedCallBack?()
-//            }
-//        }
+        if let data = self.containerView?.frame.contains(newPoint), data {
+            if !IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
+                self.convertHeaderClickedCallBack?()
+            }
+        }
     }
     
     @objc func IAPProductPurchasedNotification(notification: Notification) {
-//        containerView.isHidden = true
+        containerView.isHidden = true
     }
     
     @objc func IAPProductRestoreFinishedNotification(notification: Notification) {
-//        containerView.isHidden = true
+        containerView.isHidden = true
     }
     
 }

PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.xib

@@ -6,7 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMConvertCollectionViewHeader" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMConvertCollectionViewHeader" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="containerView" destination="65M-xr-NTJ" id="CbO-vk-fBP"/>
                 <outlet property="imageView" destination="JZM-NO-k0s" id="hEv-AK-w8s"/>

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -253,7 +253,7 @@ class KMConvertWindowController: NSWindowController, NSTextFieldDelegate, NSWind
         // 桌机版
         wordItem.tag = convertSample.rawValue
         isShowAdvanced = true
-        if IAPProductsManager.default().isAvailableAllFunction {
+        if IAPProductsManager.default().isAvailableAllFunction() {
             if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
                 convertSample = .AdvancedWord
                 wordItem.tag = convertSample.rawValue