【综合】App Target检查

PDF Office/PDF Master/Class/Analytics/KMAnalytics.swift

@@ -113,11 +113,15 @@ extension KMAnalytics.Parameter {
         
         if (appTarget.contains(.free)) {
 #if VERSION_FREE
+#if VERSION_DMG
+#else
             self._trackEvent(eventName: eventName, parameters: parameters, platform: platform)
+#endif
 #endif
         }
         if (appTarget.contains(.pro)) {
-#if VERSION_PRO
+#if VERSION_FREE
+#else
             self._trackEvent(eventName: eventName, parameters: parameters, platform: platform)
 #endif
         }

PDF Office/PDF Master/Class/DigtalSignature/DSignatureApperanceManager.swift

@@ -244,7 +244,7 @@ class DSignatureApperanceManager: NSObject {
             }
         }
         
-//        if config.isDrawLogo {
+        if config.isDrawLogo {
 #if VERSION_FREE
 #if VERSION_DMG
         config.logo = NSImage(named: "PDF Reader Pro")
@@ -255,7 +255,7 @@ class DSignatureApperanceManager: NSObject {
 #else
         config.logo = NSImage(named: "PDF Reader Pro Edition")
 #endif
-//        }
+        }
         config.contents = self.sortContens(contents as NSArray) as? [CPDFSignatureConfigItem]
         return config
     }

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

@@ -717,18 +717,50 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
     func beginConvert() {
         var isLimitConvert = false
         
-        if (KMLightMemberManager.manager.canPayFunction() == false) {
-            if self.convertType == .PNG ||
+#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 {
+                .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 ||
+            .JPEG == self.convertType ||
+            .JPG == self.convertType ||
+            .HTML == self.convertType ||
+            .Text == self.convertType ||
+            .Word == self.convertType) {
+            isLimitConvert = false
+        } else {
+            isLimitConvert = true
+        }
+    }
+#endif
         
         self.showWaitting()
         let pages = NSMutableArray()

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -19519,6 +19519,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 					"VERSION_DMG=1",
+					"VERSION_FREE=1",
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "PDF-Reader-Pro-DMG-Info.plist";
@@ -19697,7 +19698,10 @@
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/AIInfo/Resources",
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = "VERSION_DMG=1";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"VERSION_DMG=1",
+					"VERSION_FREE=1",
+				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "PDF-Reader-Pro-DMG-Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "PDF Reader Pro";

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -769,5 +769,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D92A759C-3707-482C-9BF8-AD0EC4BBCF95"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFTools/OCRNew/Model/KMOCROperation.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "26"
+            endingLineNumber = "26"
+            landmarkName = "KMOCROperationDelegate"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>