Ver código fonte

【综合】代码移植检测

niehaoyu 11 meses atrás
pai
commit
c9a00eb14c

+ 1 - 1
PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMConvertGuideView.xib

@@ -181,7 +181,7 @@
                                         <constraint firstAttribute="bottom" secondItem="cd9-us-gA4" secondAttribute="bottom" constant="2" id="eBP-bj-97X"/>
                                     </constraints>
                                 </customView>
-                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="FGE-HD-uMz" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="FGE-HD-uMz" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="160" y="20" width="67" height="32"/>
                                     <view key="contentView" id="2H3-w4-Cbp">
                                         <rect key="frame" x="1" y="1" width="65" height="30"/>

+ 3 - 3
PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMOpenFileFunctionView.xib

@@ -9,7 +9,7 @@
         <customObject id="-2" userLabel="File's Owner"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileFunctionView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileFunctionView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="650" height="555"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -88,7 +88,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <box boxType="custom" borderType="none" borderWidth="0.0" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="FJl-RQ-aGl" customClass="KMBox">
+                                <box boxType="custom" borderType="none" borderWidth="0.0" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="FJl-RQ-aGl" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="90" y="20" width="140" height="32"/>
                                     <view key="contentView" id="fv6-AS-ufh">
                                         <rect key="frame" x="0.0" y="0.0" width="140" height="32"/>
@@ -102,7 +102,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eRC-jL-IiE" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eRC-jL-IiE" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="140" height="32"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="0lx-HA-MnD">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

+ 4 - 4
PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuidePanel.xib

@@ -9,7 +9,7 @@
         <customObject id="-2" userLabel="File's Owner"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileGuidePanel" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileGuidePanel" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="542" height="333"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -59,7 +59,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Vr-wV-SBn" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Vr-wV-SBn" customClass="HyperLinkButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="20" y="24" width="31" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Skip" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="pZd-Hn-tkd">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -77,7 +77,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <box boxType="custom" borderType="line" cornerRadius="2" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="IbE-FE-DVm" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="2" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="IbE-FE-DVm" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="226" y="20" width="54" height="24"/>
                                     <view key="contentView" id="hkS-QN-7FN">
                                         <rect key="frame" x="1" y="1" width="52" height="22"/>
@@ -91,7 +91,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rcg-Wi-UML" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rcg-Wi-UML" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="52" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Wdi-PP-b3A">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

+ 2 - 2
PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuideProperty.xib

@@ -77,7 +77,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="YQ0-n2-Zra" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="YQ0-n2-Zra" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="117" y="20" width="74" height="24"/>
                                     <view key="contentView" id="9lN-rw-8FM">
                                         <rect key="frame" x="1" y="1" width="72" height="22"/>
@@ -116,7 +116,7 @@
                                         <constraint firstAttribute="width" constant="74" id="dLd-dV-ZBI"/>
                                     </constraints>
                                 </box>
-                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="PQF-KT-kWh" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="PQF-KT-kWh" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="226" y="20" width="54" height="24"/>
                                     <view key="contentView" id="OXW-b3-sa7">
                                         <rect key="frame" x="1" y="1" width="52" height="22"/>

+ 6 - 6
PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuideToolbar.xib

@@ -9,7 +9,7 @@
         <customObject id="-2" userLabel="File's Owner"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileGuideToolbar" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileGuideToolbar" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="834" height="600"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -67,7 +67,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IcK-uc-vJ1" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IcK-uc-vJ1" customClass="HyperLinkButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="20" y="24" width="31" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Skip" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="LDh-Vl-Io3">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -77,7 +77,7 @@
                                         <action selector="skipAction:" target="c22-O7-iKe" id="UD7-zt-foX"/>
                                     </connections>
                                 </button>
-                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="OZ9-Yi-MBb" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="OZ9-Yi-MBb" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="109" y="20" width="87" height="24"/>
                                     <view key="contentView" id="0c0-H4-6sb">
                                         <rect key="frame" x="1" y="1" width="85" height="22"/>
@@ -91,7 +91,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="58D-bW-g7B" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="58D-bW-g7B" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="85" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="BFx-9S-vka">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -125,7 +125,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="f75-J4-JwF" customClass="KMBox">
+                                <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="f75-J4-JwF" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="231" y="20" width="69" height="24"/>
                                     <view key="contentView" id="Kan-u9-G9J">
                                         <rect key="frame" x="1" y="1" width="67" height="22"/>
@@ -139,7 +139,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="esa-bm-Tgn" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="esa-bm-Tgn" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="67" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="bZf-5y-kyg">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

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

@@ -150,15 +150,15 @@ static KMVerificationWindowController *_currentWindowController = nil;
         _normalViewController = [[KMVerificationViewController alloc] init];
         _normalViewController.callback = ^(NSInteger index) {
             if (index == 0) {
-                [self setContentView:self.activateViewController.view];
+                [blockSelf setContentView:blockSelf.activateViewController.view];
             } else if (index == 1) {
                 if (KMVerificationTypeActivateExpired == self.type) {
-                    [self verificationFeedback];
+                    [blockSelf verificationFeedback];
                 } else {
-                    [self close];
+                    [blockSelf close];
                 }
             } else {
-                [self verificationBuy];
+                [blockSelf verificationBuy];
             }
         };
         if (KMVerificationTypeTrialExpired == self.type) {