综合 - 替换bundleID、LicenseKey、secret

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -12295,12 +12295,13 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Master/PDF_Master.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPYING_PRESERVES_HFS_DATA = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = Q43DRF894U;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = Q43DRF894U;
 				ENABLE_HARDENED_RUNTIME = YES;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -12336,7 +12337,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.kdanmobile.pdfreader-mac";
+				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.mac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -12358,12 +12359,13 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Master/PDF_Master.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPYING_PRESERVES_HFS_DATA = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = Q43DRF894U;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = Q43DRF894U;
 				ENABLE_HARDENED_RUNTIME = YES;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -12396,7 +12398,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.kdanmobile.pdfreader-mac";
+				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.mac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m

@@ -930,7 +930,7 @@
                     NSNumber *sizeString = [textNote.font.fontDescriptor objectForKey:NSFontSizeAttribute];
                     self.fontSizeVC.stringValue = [NSString stringWithFormat:@"%@pt",sizeString.stringValue];
 
-                    NSDictionary *model = [self freeTextPropertWithTitle:self.defaultPopUpButton.title];
+                    NSDictionary *model = [self freeTextPropertWithTitle:self.defaultPopUpButton.indexOfSelectedItem];
                     if (model) {
                         NSArray *modelFontNames = [model[@"fontName"] componentsSeparatedByString:@"-"];
                         if ([self.fontStyleVC.stringValue isEqualToString:@"Regular"] && (modelFontNames.count == 1)) {
@@ -1040,7 +1040,7 @@
                 NSNumber *sizeString = [textNote.font.fontDescriptor objectForKey:NSFontSizeAttribute];
                 self.fontSizeVC.stringValue = [NSString stringWithFormat:@"%@pt",sizeString.stringValue];
 
-                NSDictionary *model = [self freeTextPropertWithTitle:self.defaultPopUpButton.title];
+                NSDictionary *model = [self freeTextPropertWithTitle:self.defaultPopUpButton.indexOfSelectedItem];
                 if (model) {
                     NSArray *modelFontNames = [model[@"fontName"] componentsSeparatedByString:@"-"];
                     if ([self.fontStyleVC.stringValue isEqualToString:@"Regular"] && (modelFontNames.count == 1)) {
@@ -1155,7 +1155,7 @@
         NSNumber *sizeString = [currentFont.fontDescriptor objectForKey:NSFontSizeAttribute];
         self.fontSizeVC.stringValue = [NSString stringWithFormat:@"%@pt",sizeString.stringValue];
         
-        NSDictionary *model = [self freeTextPropertWithTitle:self.defaultPopUpButton.title];
+        NSDictionary *model = [self freeTextPropertWithTitle:self.defaultPopUpButton.indexOfSelectedItem];
         if (model) {
             NSArray *modelFontNames = [model[@"fontName"] componentsSeparatedByString:@"-"];
             if ([self.fontStyleVC.stringValue isEqualToString:@"Regular"] && (modelFontNames.count == 1)) {
@@ -1320,24 +1320,25 @@
     self.generalImageView.image = [self.annotationModel annotationImage];
 }
 
-- (NSDictionary *)freeTextPropertWithTitle:(NSString *)string {
+- (NSDictionary *)freeTextPropertWithTitle:(NSInteger)integer {
     NSDictionary *model;
     NSArray *array = [CPDFAnnotationModel defaultFreeTextPropert];
-    if ([string isEqualToString:@"Customize"]) {
-        model = [array objectAtIndex:0];
-    } else if ([string isEqualToString:@"H1 Headline"]) {
-        model = [array objectAtIndex:1];
-    } else if ([string isEqualToString:@"H2 Title"]) {
-        model = [array objectAtIndex:2];
-    } else if ([string isEqualToString:@"H3 Subtitle"]) {
-        model = [array objectAtIndex:3];
-    } else if ([string isEqualToString:@"B1 Text"]) {
-        model = [array objectAtIndex:4];
-    } else if ([string isEqualToString:@"B2 Small Text"]) {
-        model = [array objectAtIndex:5];
-    } else if ([string isEqualToString:@"B3 Describtion"]) {
-        model = [array objectAtIndex:6];
-    }
+//    if ([string isEqualToString:@"Customize"]) {
+//        model = [array objectAtIndex:0];
+//    } else if ([string isEqualToString:@"H1 Headline"]) {
+//        model = [array objectAtIndex:1];
+//    } else if ([string isEqualToString:@"H2 Title"]) {
+//        model = [array objectAtIndex:2];
+//    } else if ([string isEqualToString:@"H3 Subtitle"]) {
+//        model = [array objectAtIndex:3];
+//    } else if ([string isEqualToString:@"B1 Text"]) {
+//        model = [array objectAtIndex:4];
+//    } else if ([string isEqualToString:@"B2 Small Text"]) {
+//        model = [array objectAtIndex:5];
+//    } else if ([string isEqualToString:@"B3 Describtion"]) {
+//        model = [array objectAtIndex:6];
+//    }
+    model = [array objectAtIndex:integer];
     return model;
 }