Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

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

@@ -45,7 +45,6 @@
 #import "CSelfSignAnnotationFreeText.h"
 #import "CSelfSignAnnotation.h"
 //广告
-#import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
 #import <Sparkle/Sparkle.h>
 #import "SKLocalization.h"

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

@@ -6521,7 +6521,7 @@
 		BBFBE6D528DD7B98008B2335 /* PDF Reader ProUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PDF Reader ProUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BBFBE6D928DD7B98008B2335 /* PDF_MasterUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PDF_MasterUITests.swift; sourceTree = "<group>"; };
 		BBFBE6DB28DD7B98008B2335 /* PDF_MasterUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PDF_MasterUITestsLaunchTests.swift; sourceTree = "<group>"; };
-		BBFBE6EC28DD7C20008B2335 /* PDF Reader Pro Pro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PDF Reader Pro Pro.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BBFBE6EC28DD7C20008B2335 /* PDF Reader Pro Edition.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PDF Reader Pro Edition.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BBFBE6EE28DD7C20008B2335 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		BBFBE6F028DD7C20008B2335 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		BBFBE6F228DD7C21008B2335 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -6532,7 +6532,7 @@
 		BBFBE70628DD7C21008B2335 /* PDF Reader Pro ProUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PDF Reader Pro ProUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BBFBE70A28DD7C21008B2335 /* PDF_ Master_ProUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PDF_ Master_ProUITests.swift"; sourceTree = "<group>"; };
 		BBFBE70C28DD7C21008B2335 /* PDF_ Master_ProUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PDF_ Master_ProUITestsLaunchTests.swift"; sourceTree = "<group>"; };
-		BBFBE71B28DD7C43008B2335 /* PDF Reader Pro DMG.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PDF Reader Pro DMG.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BBFBE71B28DD7C43008B2335 /* PDF Reader Pro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PDF Reader Pro.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BBFBE71D28DD7C43008B2335 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		BBFBE71F28DD7C43008B2335 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		BBFBE72128DD7C43008B2335 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -11886,10 +11886,10 @@
 				BBFBE6BA28DD7B97008B2335 /* PDF Reader Pro.app */,
 				BBFBE6CB28DD7B98008B2335 /* PDF Reader ProTests.xctest */,
 				BBFBE6D528DD7B98008B2335 /* PDF Reader ProUITests.xctest */,
-				BBFBE6EC28DD7C20008B2335 /* PDF Reader Pro Pro.app */,
+				BBFBE6EC28DD7C20008B2335 /* PDF Reader Pro Edition.app */,
 				BBFBE6FC28DD7C21008B2335 /* PDF Reader Pro ProTests.xctest */,
 				BBFBE70628DD7C21008B2335 /* PDF Reader Pro ProUITests.xctest */,
-				BBFBE71B28DD7C43008B2335 /* PDF Reader Pro DMG.app */,
+				BBFBE71B28DD7C43008B2335 /* PDF Reader Pro.app */,
 				BBFBE72B28DD7C43008B2335 /* PDF Reader Pro DMGTests.xctest */,
 				BBFBE73528DD7C43008B2335 /* PDF Reader Pro DMGUITests.xctest */,
 			);
@@ -12233,9 +12233,9 @@
 			productReference = BBFBE6D528DD7B98008B2335 /* PDF Reader ProUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
-		BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Pro */ = {
+		BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Edition */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = BBFBE70E28DD7C21008B2335 /* Build configuration list for PBXNativeTarget "PDF Reader Pro Pro" */;
+			buildConfigurationList = BBFBE70E28DD7C21008B2335 /* Build configuration list for PBXNativeTarget "PDF Reader Pro Edition" */;
 			buildPhases = (
 				BBFBE6E828DD7C20008B2335 /* Sources */,
 				BBFBE6E928DD7C20008B2335 /* Frameworks */,
@@ -12247,9 +12247,9 @@
 			);
 			dependencies = (
 			);
-			name = "PDF Reader Pro Pro";
+			name = "PDF Reader Pro Edition";
 			productName = "PDF Master Pro";
-			productReference = BBFBE6EC28DD7C20008B2335 /* PDF Reader Pro Pro.app */;
+			productReference = BBFBE6EC28DD7C20008B2335 /* PDF Reader Pro Edition.app */;
 			productType = "com.apple.product-type.application";
 		};
 		BBFBE6FB28DD7C21008B2335 /* PDF Reader Pro ProTests */ = {
@@ -12305,7 +12305,7 @@
 			);
 			name = "PDF Reader Pro DMG";
 			productName = "PDF Master DMG";
-			productReference = BBFBE71B28DD7C43008B2335 /* PDF Reader Pro DMG.app */;
+			productReference = BBFBE71B28DD7C43008B2335 /* PDF Reader Pro.app */;
 			productType = "com.apple.product-type.application";
 		};
 		BBFBE72A28DD7C43008B2335 /* PDF Reader Pro DMGTests */ = {
@@ -12412,7 +12412,7 @@
 				BBFBE6B928DD7B97008B2335 /* PDF Reader Pro */,
 				BBFBE6CA28DD7B98008B2335 /* PDF Reader ProTests */,
 				BBFBE6D428DD7B98008B2335 /* PDF Reader ProUITests */,
-				BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Pro */,
+				BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Edition */,
 				BBFBE6FB28DD7C21008B2335 /* PDF Reader Pro ProTests */,
 				BBFBE70528DD7C21008B2335 /* PDF Reader Pro ProUITests */,
 				BBFBE71A28DD7C43008B2335 /* PDF Reader Pro DMG */,
@@ -17141,12 +17141,12 @@
 		};
 		BBFBE6FE28DD7C21008B2335 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Pro */;
+			target = BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Edition */;
 			targetProxy = BBFBE6FD28DD7C21008B2335 /* PBXContainerItemProxy */;
 		};
 		BBFBE70828DD7C21008B2335 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Pro */;
+			target = BBFBE6EB28DD7C20008B2335 /* PDF Reader Pro Edition */;
 			targetProxy = BBFBE70728DD7C21008B2335 /* PBXContainerItemProxy */;
 		};
 		BBFBE72D28DD7C43008B2335 /* PBXTargetDependency */ = {
@@ -17370,7 +17370,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "PDF Master/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "PDF Master";
+				INFOPLIST_KEY_CFBundleDisplayName = "PDF Reader Pro";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSMainStoryboardFile = Main;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
@@ -17461,7 +17461,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "VERSION_FREE=1";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "PDF Master/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "PDF Master";
+				INFOPLIST_KEY_CFBundleDisplayName = "PDF Reader Pro";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSMainStoryboardFile = Main;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
@@ -17573,7 +17573,7 @@
 		BBFBE70F28DD7C21008B2335 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro";
+				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro Edition";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Master Pro/PDF_Master_Pro.entitlements";
@@ -17702,7 +17702,7 @@
 		BBFBE71028DD7C21008B2335 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro";
+				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro Edition";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Master Pro/PDF_Master_Pro.entitlements";
@@ -17911,7 +17911,7 @@
 		BBFBE73E28DD7C43008B2335 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro Edition";
+				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro Free";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "";
@@ -18020,6 +18020,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "PDF-Master-DMG-Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "PDF Reader Pro";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSMainStoryboardFile = Main;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
@@ -18074,12 +18075,12 @@
 				MARKETING_VERSION = 1.3.0;
 				OTHER_LDFLAGS = "-ObjC";
 				OTHER_SWIFT_FLAGS = "-DVERSION_DMG";
-				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.dmg;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
+				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Master DMG-Bridging-Header.h";
-				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Master-Swift.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Reader_Pro-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
@@ -18088,7 +18089,7 @@
 		BBFBE73F28DD7C43008B2335 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro Edition";
+				ASSETCATALOG_COMPILER_APPICON_NAME = "PDF Reader Pro Free";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "";
@@ -18193,6 +18194,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "VERSION_DMG=1";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "PDF-Master-DMG-Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "PDF Reader Pro";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSMainStoryboardFile = Main;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
@@ -18247,12 +18249,12 @@
 				MARKETING_VERSION = 1.3.0;
 				OTHER_LDFLAGS = "-ObjC";
 				OTHER_SWIFT_FLAGS = "-DVERSION_DMG";
-				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.dmg;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
+				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Master DMG-Bridging-Header.h";
-				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Master-Swift.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Reader_Pro-Swift.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -18381,7 +18383,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		BBFBE70E28DD7C21008B2335 /* Build configuration list for PBXNativeTarget "PDF Reader Pro Pro" */ = {
+		BBFBE70E28DD7C21008B2335 /* Build configuration list for PBXNativeTarget "PDF Reader Pro Edition" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				BBFBE70F28DD7C21008B2335 /* Debug */,