【综合】AppStore版本新增检测更新逻辑

PDF Office/PDF Master/AppDelegate.swift

@@ -104,6 +104,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         
 #if VERSION_DMG
         VerificationManager.default()
+        
+#else
+        self.initiVersionData()
+        
 #endif
         
         
@@ -288,7 +292,45 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         NotificationCenter.default.post(name: Notification.Name(rawValue: "kEffectiveAppearance"), object: nil)
     }
     
-    // MARK: Menu
+    //MARK: - iVersion
+    func initiVersionData() -> Void{
+    #if VERSION_DMG
+        return;
+    #endif
+        let tVersion = iVersion.sharedInstance()
+        tVersion?.applicationBundleID = Bundle.main.bundleIdentifier
+
+        var tStr = "New Update Available"
+        tVersion?.updateAvailableTitle = tVersion?.localizedString(forKey: tStr, withDefault: tStr)
+        tVersion?.versionLabelFormat = ""
+        tVersion?.groupNotesByVersion = true
+        tVersion?.showOnFirstLaunch = false
+        
+        tVersion?.checkPeriod = 2
+        tVersion?.remindPeriod = 5
+        
+        let infoDictionary = Bundle .main.infoDictionary!
+        var appName: String = infoDictionary["CFBundleDisplayName"] as! String
+        if appName.count < 1 {
+            appName = infoDictionary["CFBundleName"] as! String
+        }
+  
+        tStr = "The new version of %@ is available now. Go update for new features.";
+        tStr = (tVersion?.localizedString(forKey: tStr, withDefault: tStr))!
+        tStr = String(format: tStr, appName)
+
+        tVersion?.inThisVersionTitle = "\n" + tStr
+        
+        tStr = "UPDATE NOW";
+        tVersion!.downloadButtonLabel = tVersion?.localizedString(forKey: tStr, withDefault: tStr)
+
+        tStr = "LATER";
+        tVersion!.remindButtonLabel = tVersion?.localizedString(forKey: tStr, withDefault: tStr)
+        tVersion!.ignoreButtonLabel = ""
+         
+    }
+    
+    // MARK: - Menu
     func initMainMenu() {
         // 处理菜单栏多语
         let mainMenu = NSApp.mainMenu

PDF Office/PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h

@@ -78,6 +78,7 @@
 #import "AppSandboxFileAccess.h"
 
 #import "iRate.h"
+#import "iVersion.h"
 #import "IAPProductsManager.h"
 #import "VerificationManager.h"
 #import "KMPurchaseCompareWindowController.h"

PDF Office/PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h

@@ -74,6 +74,7 @@
 #import "AppSandboxFileAccess.h"
 
 #import "iRate.h"
+#import "iVersion.h"
 #import "IAPProductsManager.h"
 #import "VerificationManager.h"
 #import "KMPurchaseCompareWindowController.h"

PDF Office/PDF Master/PDF_Reader_Pro-Bridging-Header.h

@@ -74,6 +74,7 @@
 #import "AppSandboxFileAccess.h"
 
 #import "iRate.h"
+#import "iVersion.h"
 #import "IAPProductsManager.h"
 #import "VerificationManager.h"
 #import "KMPurchaseCompareWindowController.h"

PDF Office/PDF Master/Third Pard Library/iVersion/iVersion.bundle/da.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+"iVersionInThisVersionTitle" = "Nyheder i denne version";
+"iVersionUpdateAvailableTitle" = "Ny version tilgængelig";
+"iVersionVersionLabelFormat" = "Version %@";
+"iVersionIgnoreButton" = "Ignorér";
+"iVersionDownloadButton" = "Hent";
+"iVersionRemindButton" = "Påmind mig senere";
+"iVersionOKButton" = "OK";

PDF Office/PDF Master/Third Pard Library/iVersion/iVersion.h

@@ -0,0 +1,186 @@
+//
+//  iVersion.h
+//
+//  Version 1.11.5
+//
+//  Created by Nick Lockwood on 26/01/2011.
+//  Copyright 2011 Charcoal Design
+//
+//  Distributed under the permissive zlib license
+//  Get the latest version from here:
+//
+//  https://github.com/nicklockwood/iVersion
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty.  In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source distribution.
+//
+
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-missing-property-synthesis"
+
+
+#import <Availability.h>
+#undef weak_delegate
+#if __has_feature(objc_arc_weak) && \
+(TARGET_OS_IPHONE || __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_8)
+#define weak_delegate weak
+#else
+#define weak_delegate unsafe_unretained
+#endif
+
+
+#import <TargetConditionals.h>
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+
+#define IVERSION_USE_STOREKIT   1
+
+#define IVERSION_EXTERN UIKIT_EXTERN
+#else
+#import <Cocoa/Cocoa.h>
+#define IVERSION_EXTERN APPKIT_EXTERN
+#endif
+
+
+#if defined(IVERSION_USE_STOREKIT) && IVERSION_USE_STOREKIT
+#import <StoreKit/StoreKit.h>
+#endif
+
+
+extern NSString *const iVersionErrorDomain;
+
+//localisation string keys
+IVERSION_EXTERN NSString *const iVersionInThisVersionTitleKey; //iVersionInThisVersionTitle
+IVERSION_EXTERN NSString *const iVersionUpdateAvailableTitleKey; //iVersionUpdateAvailableTitle
+IVERSION_EXTERN NSString *const iVersionVersionLabelFormatKey; //iVersionVersionLabelFormat
+IVERSION_EXTERN NSString *const iVersionOKButtonKey; //iVersionOKButton
+IVERSION_EXTERN NSString *const iVersionIgnoreButtonKey; //iVersionIgnoreButton
+IVERSION_EXTERN NSString *const iVersionRemindButtonKey; //iVersionRemindButton
+IVERSION_EXTERN NSString *const iVersionDownloadButtonKey; //iVersionDownloadButton
+
+
+typedef NS_ENUM(NSUInteger, iVersionErrorCode)
+{
+    iVersionErrorBundleIdDoesNotMatchAppStore = 1,
+    iVersionErrorApplicationNotFoundOnAppStore,
+    iVersionErrorOSVersionNotSupported
+};
+
+
+typedef NS_ENUM(NSInteger, iVersionUpdatePriority)
+{
+    iVersionUpdatePriorityDefault = 0,
+    iVersionUpdatePriorityLow = 1,
+    iVersionUpdatePriorityMedium = 2,
+    iVersionUpdatePriorityHigh = 3
+};
+
+
+@interface NSString(iVersion)
+
+- (NSComparisonResult)compareVersion:(NSString *)version;
+- (NSComparisonResult)compareVersionDescending:(NSString *)version;
+
+@end
+
+
+@protocol iVersionDelegate <NSObject>
+@optional
+
+- (BOOL)iVersionShouldCheckForNewVersion;
+- (void)iVersionDidNotDetectNewVersion;
+- (void)iVersionVersionCheckDidFailWithError:(NSError *)error;
+- (void)iVersionDidDetectNewVersion:(NSString *)version details:(NSString *)versionDetails;
+- (BOOL)iVersionShouldDisplayNewVersion:(NSString *)version details:(NSString *)versionDetails;
+- (BOOL)iVersionShouldDisplayCurrentVersionDetails:(NSString *)versionDetails;
+- (void)iVersionUserDidAttemptToDownloadUpdate:(NSString *)version;
+- (void)iVersionUserDidRequestReminderForUpdate:(NSString *)version;
+- (void)iVersionUserDidIgnoreUpdate:(NSString *)version;
+- (BOOL)iVersionShouldOpenAppStore;
+- (void)iVersionDidPresentStoreKitModal;
+- (void)iVersionDidDismissStoreKitModal;
+
+@end
+
+
+@interface iVersion : NSObject
+
++ (iVersion *)sharedInstance;
+
+//app store ID - this is only needed if your
+//bundle ID is not unique between iOS and Mac app stores
+@property (nonatomic, assign) NSUInteger appStoreID;
+
+//application details - these are set automatically
+@property (nonatomic, copy) NSString *applicationVersion;
+@property (nonatomic, copy) NSString *applicationBundleID;
+@property (nonatomic, copy) NSString *appStoreCountry;
+
+//usage settings - these have sensible defaults
+@property (nonatomic, assign) BOOL showOnFirstLaunch;
+@property (nonatomic, assign) BOOL groupNotesByVersion;
+@property (nonatomic, assign) float checkPeriod;
+@property (nonatomic, assign) float remindPeriod;
+
+//message text - you may wish to customise these
+@property (nonatomic, copy) NSString *inThisVersionTitle;
+@property (nonatomic, copy) NSString *updateAvailableTitle;
+@property (nonatomic, copy) NSString *versionLabelFormat;
+@property (nonatomic, copy) NSString *okButtonLabel;
+@property (nonatomic, copy) NSString *ignoreButtonLabel;
+@property (nonatomic, copy) NSString *remindButtonLabel;
+@property (nonatomic, copy) NSString *downloadButtonLabel;
+@property (nonatomic, copy) NSString *versionDetailsDefault;
+
+
+//debugging and prompt overrides
+@property (nonatomic, assign) iVersionUpdatePriority updatePriority;
+@property (nonatomic, assign) BOOL useUIAlertControllerIfAvailable;
+@property (nonatomic, assign) BOOL useAllAvailableLanguages;
+@property (nonatomic, assign) BOOL onlyPromptIfMainWindowIsAvailable;
+@property (nonatomic, assign) BOOL useAppStoreDetailsIfNoPlistEntryFound;
+@property (nonatomic, assign) BOOL checkAtLaunch;
+@property (nonatomic, assign) BOOL verboseLogging;
+@property (nonatomic, assign) BOOL previewMode;
+
+//advanced properties for implementing custom behaviour
+@property (nonatomic, copy) NSString *remoteVersionsPlistURL;
+@property (nonatomic, copy) NSString *localVersionsPlistPath;
+@property (nonatomic, copy) NSString *ignoredVersion;
+@property (nonatomic, strong) NSDate *lastChecked;
+@property (nonatomic, strong) NSDate *lastReminded;
+@property (nonatomic, strong) NSURL *updateURL;
+@property (nonatomic, assign) BOOL viewedVersionDetails;
+@property (nonatomic, weak_delegate) id<iVersionDelegate> delegate;
+
+//manually control behaviour
+- (BOOL)openAppPageInAppStore;
+- (void)checkIfNewVersion;
+- (NSString *)versionDetails;
+- (BOOL)shouldCheckForNewVersion;
+- (void)checkForNewVersion;
+
+
+- (NSString *)localizedStringForKey:(NSString *)key withDefault:(NSString *)defaultString;
+
+@end
+
+
+#pragma clang diagnostic pop
+

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

@@ -3016,6 +3016,12 @@
 		BB328B632B55512F00B382C6 /* KMVerificationMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB328B5E2B55512F00B382C6 /* KMVerificationMessageViewController.m */; };
 		BB328B642B55512F00B382C6 /* KMVerificationMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB328B5E2B55512F00B382C6 /* KMVerificationMessageViewController.m */; };
 		BB328B652B55512F00B382C6 /* KMVerificationMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB328B5E2B55512F00B382C6 /* KMVerificationMessageViewController.m */; };
+		BB328B6B2B565BEC00B382C6 /* iVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = BB328B682B565BEC00B382C6 /* iVersion.m */; };
+		BB328B6C2B565BEC00B382C6 /* iVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = BB328B682B565BEC00B382C6 /* iVersion.m */; };
+		BB328B6D2B565BEC00B382C6 /* iVersion.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BB328B692B565BEC00B382C6 /* iVersion.bundle */; };
+		BB328B6E2B565BEC00B382C6 /* iVersion.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BB328B692B565BEC00B382C6 /* iVersion.bundle */; };
+		BB328B6F2B565BEC00B382C6 /* iVersion.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BB328B692B565BEC00B382C6 /* iVersion.bundle */; };
+		BB328B702B565EC500B382C6 /* iVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = BB328B682B565BEC00B382C6 /* iVersion.m */; };
 		BB32BF232A5EA05900D11348 /* KMAnalytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB32BF222A5EA05900D11348 /* KMAnalytics.swift */; };
 		BB32BF242A5EA05900D11348 /* KMAnalytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB32BF222A5EA05900D11348 /* KMAnalytics.swift */; };
 		BB32BF252A5EA05900D11348 /* KMAnalytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB32BF222A5EA05900D11348 /* KMAnalytics.swift */; };
@@ -5990,6 +5996,9 @@
 		BB328B5D2B55512F00B382C6 /* KMVerificationMessageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMVerificationMessageViewController.xib; sourceTree = "<group>"; };
 		BB328B5E2B55512F00B382C6 /* KMVerificationMessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMVerificationMessageViewController.m; sourceTree = "<group>"; };
 		BB328B5F2B55512F00B382C6 /* KMVerificationMessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMVerificationMessageViewController.h; sourceTree = "<group>"; };
+		BB328B672B565BEC00B382C6 /* iVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iVersion.h; sourceTree = "<group>"; };
+		BB328B682B565BEC00B382C6 /* iVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iVersion.m; sourceTree = "<group>"; };
+		BB328B692B565BEC00B382C6 /* iVersion.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = iVersion.bundle; sourceTree = "<group>"; };
 		BB32BF222A5EA05900D11348 /* KMAnalytics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAnalytics.swift; sourceTree = "<group>"; };
 		BB332D522995D8B500CABB58 /* KMCloudDocumentTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCloudDocumentTools.swift; sourceTree = "<group>"; };
 		BB35732C2AF4F07B004CDA92 /* BatchImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = BatchImage.xcassets; sourceTree = "<group>"; };
@@ -6908,6 +6917,7 @@
 		89752DA22936ECD5003FF08E /* Third Pard Library */ = {
 			isa = PBXGroup;
 			children = (
+				BB328B662B565BEC00B382C6 /* iVersion */,
 				BB67EE042B54FFEF00573BF0 /* ASIHttpRequest */,
 				ADFCEB422B4FBA430001EBAF /* RemoteConfig  */,
 				ADDDCE1A2B43A32A005B4AB5 /* AppSandboxFileAccess */,
@@ -10388,6 +10398,16 @@
 			path = Tools;
 			sourceTree = "<group>";
 		};
+		BB328B662B565BEC00B382C6 /* iVersion */ = {
+			isa = PBXGroup;
+			children = (
+				BB328B672B565BEC00B382C6 /* iVersion.h */,
+				BB328B682B565BEC00B382C6 /* iVersion.m */,
+				BB328B692B565BEC00B382C6 /* iVersion.bundle */,
+			);
+			path = iVersion;
+			sourceTree = "<group>";
+		};
 		BB32BF212A5EA02900D11348 /* Analytics */ = {
 			isa = PBXGroup;
 			children = (
@@ -12944,6 +12964,7 @@
 				BBB29BCE2AEA190D005F1B6B /* KMToolbarCustomViewController.xib in Resources */,
 				BB276A5C2B038D3A00AB5578 /* KMOCRPDFWindowController.xib in Resources */,
 				BBC70EA92AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */,
+				BB328B6D2B565BEC00B382C6 /* iVersion.bundle in Resources */,
 				89DB5DAA291B8DE70029624F /* KMOutlineEditViewController.xib in Resources */,
 				BB003029298CF7EC002DD1A0 /* KMPreferenceDisplayController.xib in Resources */,
 				9F0CB5452986953A00007028 /* KMURLToPDFWindowController.xib in Resources */,
@@ -13046,6 +13067,7 @@
 				AD3AAD172B0B5B2700DE5FE7 /* KMCompareContentWindowController.xib in Resources */,
 				ADDF83482B391A5C00A81A4E /* DSignatureCreateInfoViewController.xib in Resources */,
 				BBEC00D5295C33D600A26C98 /* KMCreateBatesController.xib in Resources */,
+				BB328B6E2B565BEC00B382C6 /* iVersion.bundle in Resources */,
 				BB9599C82B3164B40062D346 /* KMRedactPropertiesWindowController.xib in Resources */,
 				AD1CA3FB2A05FCB60070541F /* KMAnnotationScreenViewController.xib in Resources */,
 				BB1969DC2B2842D700922736 /* SnapshotWindow.xib in Resources */,
@@ -13908,6 +13930,7 @@
 				BB1969DD2B2842D700922736 /* SnapshotWindow.xib in Resources */,
 				BB69C95E299116FD0001A9B1 /* five_line_score.pdf in Resources */,
 				BB89725B294C559F0045787C /* KMWatermarkPropertyCreateController.xib in Resources */,
+				BB328B6F2B565BEC00B382C6 /* iVersion.bundle in Resources */,
 				ADBC2D3C299F0A5A006280C8 /* KMPrintHelpViewController.xib in Resources */,
 				AD1D481E2AFB6B96007AC1F0 /* KMMergeWindowController.xib in Resources */,
 				ADB2D6F4294741720029D2B3 /* KMPrintPaperSetView.xib in Resources */,
@@ -14047,6 +14070,7 @@
 				ADF6B87E2A485A8F0090CB78 /* KMComparativeViewCollectionItemItem.swift in Sources */,
 				BBB9B310299A5D6D004F3235 /* KMCloudDownloadOperationQueue.m in Sources */,
 				ADBC375429CAE94700D93208 /* KMComparativeOutlineSectionCell.swift in Sources */,
+				BB328B702B565EC500B382C6 /* iVersion.m in Sources */,
 				9F1FE4C329406E4700E952CA /* CTPageTransition.c in Sources */,
 				9FA607DE28FD4C9F00B46586 /* KMHomePopViewController.swift in Sources */,
 				BBDA8A692A31B50C006A2C4E /* KMCustomStepperView.swift in Sources */,
@@ -15844,6 +15868,7 @@
 				ADDF83962B391A5D00A81A4E /* DSignDetailTypeACellView.swift in Sources */,
 				BB0B2CDD2B04B9510088FFD8 /* KMLeftSideViewSearchField.swift in Sources */,
 				BB146FB8299DC0D100784A6A /* GTLRRuntimeCommon.m in Sources */,
+				BB328B6B2B565BEC00B382C6 /* iVersion.m in Sources */,
 				BB8B173D2907CDD9001C5EA5 /* NibLoadable.swift in Sources */,
 				BB4A94922B04926700940F8B /* KMGOCROperation.swift in Sources */,
 				9F0CB51A2986568000007028 /* KMDesignToken+BorderRadiusTopRight.swift in Sources */,
@@ -17186,6 +17211,7 @@
 				8997011028F40842009AF911 /* KMOutlineViewController.swift in Sources */,
 				9F1F82BE292E01860092C4B4 /* KMCloudEmptyCollectionViewItem.swift in Sources */,
 				BB0353CA2B2987C40048A16C /* KMSnapshotWindow.swift in Sources */,
+				BB328B6C2B565BEC00B382C6 /* iVersion.m in Sources */,
 				AD3AAD2E2B0B6FFA00DE5FE7 /* KMCompareCoveringView.swift in Sources */,
 				BB6DD8272934D056001F0544 /* KMSecureEncryptSuccessTipView.swift in Sources */,
 				BBFDFAA82AF3899400E08AA2 /* PasswordWindowController.swift in Sources */,

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

@@ -3,38 +3,4 @@
    uuid = "BF64BADD-A23F-49AC-863F-CAF093A6E4D7"
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B76B13E1-8734-4B17-9930-B97EF4578D2C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "392"
-            endingLineNumber = "392"
-            landmarkName = "-verificationWithComplention:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5423EA5F-EE41-4612-B7F2-9CB978699CA3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "369"
-            endingLineNumber = "369"
-            landmarkName = "-verificationWithComplention:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>