【转档】- 代理释放

PDF Office/PDF Master/Class/Batch/Operation/KMBatchConvertOperation.swift

@@ -205,6 +205,7 @@ class KMBatchConvertOperation: KMBatchOperation, CPDFConverterDelegate, CPDFConv
             }else {
                 self.delegate?.fileOperateSuccessed?(self.operateFile!, info: (self.operateFile?.currentConvertParameter!)!)
             }
+            self.fpPDFConverter?.setDelegate(nil)
             willChangeValue(forKey: "isFinished")
             hasFinished = true
             didChangeValue(forKey: "isFinished")
@@ -264,6 +265,7 @@ class KMBatchConvertOperation: KMBatchOperation, CPDFConverterDelegate, CPDFConv
         }else {
             self.delegate?.fileOperateSuccessed?(self.operateFile!, info: (self.operateFile?.currentConvertParameter!)!)
         }
+        self.converter?.delegate = nil
         willChangeValue(forKey: "isFinished")
         hasFinished = true
         didChangeValue(forKey: "isFinished")

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

@@ -21,7 +21,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="adF-Xf-x0M">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="adF-Xf-x0M">
                     <rect key="frame" x="8" y="241" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="ovW-WC-9XR">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -42,7 +42,7 @@
                             <rect key="frame" x="12" y="7" width="9" height="10"/>
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameElseVIP2" id="E3c-ED-XE8"/>
                         </imageView>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Sft-Vr-raz">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Sft-Vr-raz">
                             <rect key="frame" x="23" y="4" width="41" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="center" title="Label" id="SXE-93-vrI">
                                 <font key="font" metaFont="system"/>

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvert.swift

@@ -346,7 +346,7 @@ class KMPDFConvert: Operation {
     func convertSuccessful(isSuccessful: Bool, errorInfo: Error!) {
         self.isSuccessful = isSuccessful
         self.errorInfo = errorInfo
-        
+        self.converter.delegate = nil
         DispatchQueue.main.async { [self] in
             
             guard let callbackBlock = callback else {

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

@@ -725,9 +725,34 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         
 #if VERSION_FREE
 #if VERSION_DMG
-    // 桌机版
+        // 桌机版
         if IAPProductsManager.default().isAvailableAllFunction() {
             if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
+                isLimitConvert = false
+            } else {
+                if (.PNG == self.convertType ||
+                    .JPEG == self.convertType ||
+                    .JPG == self.convertType ||
+                    .HTML == self.convertType ||
+                    .Text == self.convertType ||
+                    .Word == self.convertType) {
+                    isLimitConvert = false
+                } else {
+                    isLimitConvert = true
+                }
+            }
+        } else {
+            isLimitConvert = true
+        }
+#else
+        // 免费版
+        if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() == false {
+            isLimitConvert = true
+        }
+#endif
+#else
+        // 付费版
+        if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
             isLimitConvert = false
         } else {
             if (.PNG == self.convertType ||
@@ -741,31 +766,6 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
                 isLimitConvert = true
             }
         }
-    } else {
-        isLimitConvert = true
-    }
-#else
-    // 免费版
-    if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() == false {
-        isLimitConvert = true
-    }
-#endif
-#else
-    // 付费版
-        if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
-        isLimitConvert = false
-    } else {
-        if (.PNG == self.convertType ||
-            .JPEG == self.convertType ||
-            .JPG == self.convertType ||
-            .HTML == self.convertType ||
-            .Text == self.convertType ||
-            .Word == self.convertType) {
-            isLimitConvert = false
-        } else {
-            isLimitConvert = true
-        }
-    }
 #endif
         
         self.showWaitting()

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.xib

@@ -92,7 +92,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="78" height="32"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0E3-F3-2Pg">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0E3-F3-2Pg">
                                 <rect key="frame" x="37" y="8" width="4" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" id="MOs-Eb-Gx1">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -114,7 +114,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="78" height="32"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HfE-48-3lV">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HfE-48-3lV">
                                 <rect key="frame" x="37" y="8" width="4" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" id="QTD-ci-jYJ">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -157,7 +157,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="78" height="32"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I93-Ww-ckj">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I93-Ww-ckj">
                                 <rect key="frame" x="37" y="8" width="4" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" id="dRl-PU-bWG">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -186,7 +186,7 @@
                                     </constraints>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyStamp" id="Wgu-2B-PFT"/>
                                 </imageView>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VYn-hy-KP4">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VYn-hy-KP4">
                                     <rect key="frame" x="15" y="0.0" width="204" height="40"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="40" id="9pg-4b-Ee9"/>
@@ -198,7 +198,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-u9-cE0">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-u9-cE0">
                                     <rect key="frame" x="55" y="48" width="124" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="20" id="CVU-xa-gXa"/>
@@ -363,7 +363,7 @@
                         <action selector="dynamicStampButtonItemClicked_Author:" target="-2" id="QwQ-s3-kqw"/>
                     </connections>
                 </button>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nfe-06-8Hb">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nfe-06-8Hb">
                     <rect key="frame" x="30" y="51" width="35" height="15"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="8fp-iH-M5S">
                         <font key="font" metaFont="cellTitle"/>
@@ -371,7 +371,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cf3-ij-TW3">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cf3-ij-TW3">
                     <rect key="frame" x="71" y="48" width="162" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="162" id="InN-b8-goi"/>
@@ -383,7 +383,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CiP-Jz-Xdn">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CiP-Jz-Xdn">
                     <rect key="frame" x="30" y="18" width="35" height="15"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="VD2-sn-eiH">
                         <font key="font" metaFont="cellTitle"/>
@@ -397,7 +397,7 @@
                         <rect key="frame" x="1" y="1" width="160" height="20"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wtD-Vt-js7" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wtD-Vt-js7" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                 <rect key="frame" x="-1" y="-2" width="164" height="23"/>
                                 <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" buttonBordered="NO" completes="NO" numberOfVisibleItems="5" id="oR8-Eg-1Mn" customClass="KMStampComboBoxCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <font key="font" metaFont="system"/>
@@ -538,7 +538,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="213" height="64"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tKZ-fa-8Ft">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tKZ-fa-8Ft">
                                             <rect key="frame" x="-2" y="34" width="217" height="20"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="20" id="FJF-i6-gOD"/>
@@ -616,7 +616,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="213" height="326"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UsV-0m-nUC">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UsV-0m-nUC">
                                             <rect key="frame" x="-2" y="296" width="42" height="20"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="20" id="Qva-NE-D5a"/>
@@ -700,7 +700,7 @@
                                                 <action selector="opacitySliderAction:" target="-2" id="mik-d8-oIH"/>
                                             </connections>
                                         </slider>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dl7-N2-sZY">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dl7-N2-sZY">
                                             <rect key="frame" x="-2" y="32" width="42" height="20"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="20" id="0vB-EP-csS"/>