【综合】App Target配置调整

PDF Office/PDF Master/Class/Common/Tools/KMTools.swift

@@ -440,38 +440,20 @@ extension KMTools {
     #endif
         
         // 桌机版
-//        VerificationManager *tManager = [VerificationManager manager];
-//        switch ([tManager status]) {
-//            case ActivityStatusTrial:
-//                tAppName = [tAppName stringByAppendingString:@" Trial"];
-//                break;
-//
-//            case ActivityStatusVerification:
-//                tAppName = [tAppName stringByAppendingString:@" Verification"];
-//                break;
-//
-//            case ActivityStatusTrialExpire:
-//                tAppName = [tAppName stringByAppendingString:@" TrialExpire"];
-//                break;
-//
-//            case ActivityStatusVerifExpire:
-//                tAppName = [tAppName stringByAppendingString:@" VerifExpire"];
-//                break;
-//
-//            default:
-//                break;
+//        if let tManager = VerificationManager.default() {
+//            let status = tManager.status
+//            if status == ActivityStatus.trial {
+//                tAppName = "\(tAppName) Trial"
+//            } else if status == ActivityStatus.verification {
+//                tAppName = "\(tAppName) Verification"
+//            } else if status == ActivityStatus.trialExpired {
+//                tAppName = "\(tAppName) TrialExpire"
+//            } else if status == ActivityStatus.verifExpire {
+//                tAppName = "\(tAppName) VerifExpire"
+//            }
 //        }
         if let tManager = VerificationManager.default() {
             let status = tManager.status
-            if status == ActivityStatus.trial {
-                tAppName = "\(tAppName) Trial"
-            } else if status == ActivityStatus.verification {
-                tAppName = "\(tAppName) Verification"
-            } else if status == ActivityStatus.trialExpired {
-                tAppName = "\(tAppName) TrialExpire"
-            } else if status == ActivityStatus.verifExpire {
-                tAppName = "\(tAppName) VerifExpire"
-            }
         }
     #else
         

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/KMLightMember/InAppPurchase/Appstore/KMInAppPurchaseManager.swift

@@ -11,16 +11,6 @@ import AuthenticationServices
 import Security
 
 #if VERSION_FREE
-let PRODUCT_1 = "com.pdftechnologies.pdfreader.mac.yearly.001"
-let kPRODUCTS: Set<String> = [PRODUCT_1]
-
-let kSandboxServer = "https://sandbox.itunes.apple.com/verifyReceipt";
-let kItunesServer = "https://buy.itunes.apple.com/verifyReceipt";
-
-let kStoreLiteKitSecret = "321ee8da056a45e7b963eb519c25c4fc";
-//let kStoreKitSecret = "20f0129197a34439a2130358172984bb";
-#endif
-
 #if VERSION_DMG
 let PRODUCT_1 = "com.pdfreaderpro.free.member.all_access_pack_permanent_license.001"
 let PRODUCT_2 = "com.pdfreaderpro.member.pdf_to_office_pack_permanent_license.001"
@@ -31,7 +21,18 @@ let kItunesServer = "https://buy.itunes.apple.com/verifyReceipt";
 
 let kStoreLiteKitSecret = "905532d3f55449a9b7a96161e7a2d538";
 //let kStoreKitSecret = "20f0129197a34439a2130358172984bb";
+#else
+let PRODUCT_1 = "com.pdftechnologies.pdfreader.mac.yearly.001"
+let kPRODUCTS: Set<String> = [PRODUCT_1]
+
+let kSandboxServer = "https://sandbox.itunes.apple.com/verifyReceipt";
+let kItunesServer = "https://buy.itunes.apple.com/verifyReceipt";
+
+let kStoreLiteKitSecret = "321ee8da056a45e7b963eb519c25c4fc";
+//let kStoreKitSecret = "20f0129197a34439a2130358172984bb";
 #endif
+#endif
+
 
 #if VERSION_PRO
 let PRODUCT_1 = "com.pdftechnologies.pdfreader.mac.yearly.001"

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -812,7 +812,7 @@ let LOCKED_KEY  = "locked"
         }
         self.aiTypeChooseView.clickHandle = { [weak self] view, type in
             DispatchQueue.main.async {
-                self!.loadAIConfigWindowWithType(type)
+                self?.loadAIConfigWindowWithType(type)
             }
         }
         self.aiTypeChooseView.frame = controller.view.bounds

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

@@ -19025,6 +19025,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG VERSION_FREE";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -19121,6 +19122,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = VERSION_FREE;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -19255,6 +19257,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderpro.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG VERSION_PRO";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Reader_Pro-Swift.h";
@@ -19315,6 +19318,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderpro.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = VERSION_PRO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Reader_Pro-Swift.h";
@@ -19582,6 +19586,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG VERSION_FREE VERSION_DMG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Reader_Pro-Swift.h";
@@ -19763,6 +19768,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "VERSION_FREE VERSION_DMG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Reader_Pro-Swift.h";

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

@@ -753,5 +753,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "00B1239B-3C45-4A33-968F-5C0C0E9F6FCD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "647"
+            endingLineNumber = "647"
+            landmarkName = "setDocument"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>