综合 - Swift宏定义VERSION_DMG调整，Sparkle配置调整

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -401,12 +401,6 @@
 		9F00CCC52A2F2E2400AC462E /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC22A2F2E2300AC462E /* AppCenter.framework */; };
 		9F00CCC62A2F2E2400AC462E /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC32A2F2E2400AC462E /* AppCenterAnalytics.framework */; };
 		9F00CCC72A2F2E2400AC462E /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC42A2F2E2400AC462E /* AppCenterCrashes.framework */; };
-		9F00CCC82A2F3B1200AC462E /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC22A2F2E2300AC462E /* AppCenter.framework */; };
-		9F00CCC92A2F3B1500AC462E /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC22A2F2E2300AC462E /* AppCenter.framework */; };
-		9F00CCCA2A2F3B1900AC462E /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC32A2F2E2400AC462E /* AppCenterAnalytics.framework */; };
-		9F00CCCB2A2F3B1A00AC462E /* AppCenterAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC32A2F2E2400AC462E /* AppCenterAnalytics.framework */; };
-		9F00CCCC2A2F3B1D00AC462E /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC42A2F2E2400AC462E /* AppCenterCrashes.framework */; };
-		9F00CCCD2A2F3B1E00AC462E /* AppCenterCrashes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC42A2F2E2400AC462E /* AppCenterCrashes.framework */; };
 		9F080B0F298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9F080B10298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; };
 		9F080B11298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -4796,10 +4790,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9F00CCCC2A2F3B1D00AC462E /* AppCenterCrashes.framework in Frameworks */,
 				BB9DCC8F2A09FC770024A6F1 /* libonnxruntime.1.12.0.dylib in Frameworks */,
-				9F00CCC82A2F3B1200AC462E /* AppCenter.framework in Frameworks */,
-				9F00CCCA2A2F3B1900AC462E /* AppCenterAnalytics.framework in Frameworks */,
 				BB9DCC892A09FC760024A6F1 /* libopencv_world.4.2.dylib in Frameworks */,
 				BB9DCC802A09FC750024A6F1 /* libopencv_world.dylib in Frameworks */,
 				ADE3C1CC29A5A7EE00793B13 /* AFNetworking.framework in Frameworks */,
@@ -4834,10 +4825,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9F00CCCD2A2F3B1E00AC462E /* AppCenterCrashes.framework in Frameworks */,
 				BB9DCC902A09FC770024A6F1 /* libonnxruntime.1.12.0.dylib in Frameworks */,
-				9F00CCC92A2F3B1500AC462E /* AppCenter.framework in Frameworks */,
-				9F00CCCB2A2F3B1A00AC462E /* AppCenterAnalytics.framework in Frameworks */,
 				BB9DCC8A2A09FC770024A6F1 /* libopencv_world.4.2.dylib in Frameworks */,
 				BB9DCC812A09FC760024A6F1 /* libopencv_world.dylib in Frameworks */,
 				ADE3C1C929A5A75E00793B13 /* AFNetworking.framework in Frameworks */,
@@ -13340,6 +13328,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.1.0;
+				OTHER_SWIFT_FLAGS = "-DVERSION_DMG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.dmg;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -13458,6 +13447,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.1.0;
+				OTHER_SWIFT_FLAGS = "-DVERSION_DMG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.dmg;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

PDF Office/PDF Master/AppDelegate.swift

@@ -7,9 +7,11 @@
 
 import Cocoa
 import KMAdvertisement
+#if VERSION_DMG
 import AppCenter
 import AppCenterAnalytics
 import AppCenterCrashes
+#endif
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate {
@@ -50,16 +52,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to initialize your application
         
         var appSecret = "416b8e45-69bd-4a16-8fec-b5206e913c4a"
-        let appTarget = KMTools_OC.getAppTarget()
-        if (appTarget == .DMG) {
-            appSecret = "416b8e45-69bd-4a16-8fec-b5206e913c4a"
-        }
 #if VERSION_DMG
+        print("11111")
         let updater = SUUpdater.shared()
         updater!.delegate = self
         updater!.automaticallyChecksForUpdates = true
-#endif
         
+        appSecret = "416b8e45-69bd-4a16-8fec-b5206e913c4a"
+#endif
+
         //        MARK: 广告数据初始化
         KMAdvertisementManager.manager.initConfig(appName: .PDFReaderProMac,
                                                   subscribeType: .unsubscribed,
@@ -70,10 +71,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // 初版不支持暗黑模式
         NSApp.appearance = NSAppearance(named: .aqua)
               
-        if (appTarget == .DMG) {
-            AppCenter.start(withAppSecret: appSecret, services: [Analytics.self, Crashes.self])
-        }
-        
+#if VERSION_DMG
+        AppCenter.start(withAppSecret: appSecret, services: [Analytics.self, Crashes.self])
+#endif
+
         //第一次开启app
         var info = UserDefaults.standard.value(forKey: "kFirstOpenAppCount")
         var count = 0
@@ -339,33 +340,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         SUUpdater.shared().checkForUpdates(sender)
 #endif
     }
-    
-#if VERSION_DMG
-    func updaterWillRelaunchApplication(_ updater: SUUpdater) {
-    }
-    
-    func feedURLStringForUpdater(_ updater: SUUpdater) -> String {
-#if DEBUG
-    return "http://test-pdf-pro.kdan.cn:3021/downloads/pdfmasterprocast.xml"
-#else
-    return "https://www.pdfreaderpro.com/downloads/pdfmasterprocast.xml"
-#endif
-    }
-    
-    func updaterShouldPromptForPermissionToCheckForUpdates(_ updater: SUUpdater) -> Bool {
-        return false
-    }
-    
-    func upgradeAPPWithUpdater(_ updater: SUUpdater) {
-        let string = "macappstore://apps.apple.com/cn/app/pdf-master-ai-pdf/id6446781258?mt=12"
-        let url: URL = URL(string: string)
-        NSWorkspace.shared.open(url)
-    }
-    
-    func upgradeButtonStringForUpdater(_ updater: SUUpdater) -> String {
-        return NSLocalizedString("PDF Master", comment: "")
-    }
-#endif
 }
 
 extension AppDelegate : NSMenuDelegate,NSMenuItemValidation {
@@ -469,3 +443,33 @@ extension AppDelegate : NSMenuDelegate,NSMenuItemValidation {
         return true
     }
 }
+
+#if VERSION_DMG
+extension AppDelegate : SUUpdaterDelegate {
+    func updaterWillRelaunchApplication(_ updater: SUUpdater) {
+        print("33333333333333333333333")
+    }
+    
+    func feedURLString(for updater: SUUpdater) -> String? {
+#if DEBUG
+        return "http://test-pdf-pro.kdan.cn:3021/downloads/pdfmasterprocast.xml"
+#else
+        return "https://www.pdfreaderpro.com/downloads/pdfmasterprocast.xml"
+#endif
+    }
+    
+    func updaterShouldPromptForPermissionToCheck(forUpdates updater: SUUpdater) -> Bool {
+        return false
+    }
+    
+    func upgradeAPP(with updater: SUUpdater) {
+        let string = "macappstore://apps.apple.com/cn/app/pdf-master-ai-pdf/id6446781258?mt=12"
+        let url: URL = URL(string: string)!
+        NSWorkspace.shared.open(url)
+    }
+    
+    func upgradeButtonString(for updater: SUUpdater) -> String {
+        return NSLocalizedString("PDF Master", comment: "")
+    }
+}
+#endif