PDFTools(iOS)-PDFSound的修改

Annotation-Ctrl-Demo/Annotation-Ctrl-Demo/CPDFViewController.m

@@ -12,8 +12,6 @@
 
 #import "CPDFViewController.h"
 
-#import "CPDFMediaManager.h"
-
 #import <ComPDFKit/ComPDFKit.h>
 #import <compdfkit_tools/compdfkit_tools.h>
 

ComPDFKit/ComPDFKit.xcodeproj/project.pbxproj

@@ -24,7 +24,6 @@
 		4F6B6C882A174D7F0030C94E /* ComPDFKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F6B6C752A174D6E0030C94E /* ComPDFKit.xcframework */; };
 		4F6B6C892A174D7F0030C94E /* ComPDFKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4F6B6C752A174D6E0030C94E /* ComPDFKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4F6B6C8C2A174EB80030C94E /* CPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F6B6C8A2A174EB70030C94E /* CPDFViewController.m */; };
-		4F6B6C902A1755F00030C94E /* CPDFMediaManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F6B6C8F2A1755F00030C94E /* CPDFMediaManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -65,8 +64,6 @@
 		4F6B6C842A174D7C0030C94E /* compdfkit_tools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = compdfkit_tools.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4F6B6C8A2A174EB70030C94E /* CPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFViewController.m; sourceTree = "<group>"; };
 		4F6B6C8B2A174EB70030C94E /* CPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFViewController.h; sourceTree = "<group>"; };
-		4F6B6C8E2A1755F00030C94E /* CPDFMediaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFMediaManager.h; sourceTree = "<group>"; };
-		4F6B6C8F2A1755F00030C94E /* CPDFMediaManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFMediaManager.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -123,7 +120,6 @@
 		4F6B6C702A174D6E0030C94E /* TestFile */ = {
 			isa = PBXGroup;
 			children = (
-				4F6B6C8D2A1755F00030C94E /* PDFSound */,
 				4F6B6C712A174D6E0030C94E /* Form_Widgets_Test.pdf */,
 				4F6B6C722A174D6E0030C94E /* PDF32000_2008.pdf */,
 				4F6B6C732A174D6E0030C94E /* Quick Start Guide.pdf */,
@@ -162,16 +158,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		4F6B6C8D2A1755F00030C94E /* PDFSound */ = {
-			isa = PBXGroup;
-			children = (
-				4F6B6C8E2A1755F00030C94E /* CPDFMediaManager.h */,
-				4F6B6C8F2A1755F00030C94E /* CPDFMediaManager.m */,
-			);
-			name = PDFSound;
-			path = "../Annotation-Ctrl-Demo/Annotation-Ctrl-Demo/PDFSound";
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -252,7 +238,6 @@
 				4F6B6C3C2A173F6D0030C94E /* AppDelegate.m in Sources */,
 				4F6B6C822A174D6E0030C94E /* XMLParseManager.m in Sources */,
 				4F6B6C4D2A173F6F0030C94E /* main.m in Sources */,
-				4F6B6C902A1755F00030C94E /* CPDFMediaManager.m in Sources */,
 				4F6B6C3F2A173F6D0030C94E /* SceneDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

ComPDFKit/ComPDFKit/CPDFViewController.m

@@ -12,8 +12,6 @@
 
 #import "CPDFViewController.h"
 
-#import "CPDFMediaManager.h"
-
 #import <ComPDFKit/ComPDFKit.h>
 #import <compdfkit_tools/compdfkit_tools.h>
 

Edit-Ctrl-Demo/Edit-Ctrl-Demo.xcodeproj/project.pbxproj

@@ -43,8 +43,6 @@
 
 /* Begin PBXFileReference section */
 		4F06AB5829F67A5E007797E4 /* compdfkit_tools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = compdfkit_tools.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4F1151962A1DAD2D00EC433D /* CPDFMediaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFMediaManager.h; sourceTree = "<group>"; };
-		4F1151972A1DAD2D00EC433D /* CPDFMediaManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFMediaManager.m; sourceTree = "<group>"; };
 		4F17C06129F4FBFD00445550 /* Edit-Ctrl-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Edit-Ctrl-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4F17C06429F4FBFD00445550 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		4F17C06529F4FBFD00445550 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -82,15 +80,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		4F1151982A1DAD2D00EC433D /* PDFSound */ = {
-			isa = PBXGroup;
-			children = (
-				4F1151962A1DAD2D00EC433D /* CPDFMediaManager.h */,
-				4F1151972A1DAD2D00EC433D /* CPDFMediaManager.m */,
-			);
-			path = PDFSound;
-			sourceTree = "<group>";
-		};
 		4F17C05829F4FBFD00445550 = {
 			isa = PBXGroup;
 			children = (
@@ -114,7 +103,6 @@
 				4F17C09D29F5079500445550 /* TestFile */,
 				4F17C08B29F4FEE800445550 /* Lib */,
 				4F17C08029F4FEE800445550 /* SDKLicense */,
-				4F1151982A1DAD2D00EC433D /* PDFSound */,
 				4F17C06429F4FBFD00445550 /* AppDelegate.h */,
 				4F17C06529F4FBFD00445550 /* AppDelegate.m */,
 				4F17C06729F4FBFD00445550 /* SceneDelegate.h */,

Edit-Ctrl-Demo/Edit-Ctrl-Demo/CPDFViewController.m

@@ -68,7 +68,7 @@
 
 #pragma mark - Action
 
-- (void) titleButtonClickd:(UIButton *) button {
+- (void)titleButtonClickd:(UIButton *) button {
     CPDFToolsViewController * toolsVc = [[CPDFToolsViewController alloc] initCustomizeWithToolArrays:@[@(CToolModelViewer),@(CToolModelEdit)]];
     toolsVc.delegate = self;
     AAPLCustomPresentationController *presentationController NS_VALID_UNTIL_END_OF_SCOPE;
@@ -157,13 +157,18 @@
 #pragma mark - CPDFViewDelegate
 
 - (void)PDFListViewCustomMenuClick:(CPDFListView *)pdfView identifier:(NSString *)menuIdentifier {
-    if([menuIdentifier isEqualToString:@"PropertyItem"]){
+    if([menuIdentifier isEqualToString:@"PropertyItem"]) {
         self.editMode = CPDFEditModeText;
         [self showMenuList];
         [self.toolBar updateButtonState];
     }
 }
 
+- (void)PDFViewCurrentPageDidChanged:(CPDFView *)pdfView {
+    [self.toolBar updateButtonState];
+}
+
+
 #pragma mark - CPDFToolsViewControllerDelegate
 
 - (void)CPDFToolsViewControllerDismiss:(CPDFToolsViewController *)viewController selectItemAtIndex:(CToolModel)selectIndex {

Form-Ctrl-Demo/Form-Ctrl-Demo.xcodeproj/project.pbxproj

@@ -24,7 +24,6 @@
 		4F1151862A1D9B2800EC433D /* ComPDFKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4F11517A2A1D99E700EC433D /* ComPDFKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4F11518A2A1D9B3000EC433D /* compdfkit_tools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F1151892A1D9B3000EC433D /* compdfkit_tools.framework */; };
 		4F11518B2A1D9B3000EC433D /* compdfkit_tools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4F1151892A1D9B3000EC433D /* compdfkit_tools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		4F1151922A1DACF600EC433D /* CPDFMediaManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1151902A1DACE300EC433D /* CPDFMediaManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -65,8 +64,6 @@
 		4F1151822A1D9A7600EC433D /* CPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CPDFViewController.m; path = "../../viewer-ctrl-demo/viewer-ctrl-demo/CPDFViewController.m"; sourceTree = "<group>"; };
 		4F1151832A1D9A7600EC433D /* CPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CPDFViewController.h; path = "../../viewer-ctrl-demo/viewer-ctrl-demo/CPDFViewController.h"; sourceTree = "<group>"; };
 		4F1151892A1D9B3000EC433D /* compdfkit_tools.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = compdfkit_tools.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4F11518F2A1DACE300EC433D /* CPDFMediaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFMediaManager.h; sourceTree = "<group>"; };
-		4F1151902A1DACE300EC433D /* CPDFMediaManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFMediaManager.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -102,7 +99,6 @@
 		4F1151552A1D989700EC433D /* Form-Ctrl-Demo */ = {
 			isa = PBXGroup;
 			children = (
-				4F1151912A1DACE300EC433D /* PDFSound */,
 				4F1151792A1D99E700EC433D /* Lib */,
 				4F1151732A1D99E700EC433D /* SDKLicense */,
 				4F11516F2A1D99E700EC433D /* TestFile */,
@@ -162,16 +158,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		4F1151912A1DACE300EC433D /* PDFSound */ = {
-			isa = PBXGroup;
-			children = (
-				4F11518F2A1DACE300EC433D /* CPDFMediaManager.h */,
-				4F1151902A1DACE300EC433D /* CPDFMediaManager.m */,
-			);
-			name = PDFSound;
-			path = "../../Edit-Ctrl-Demo/Edit-Ctrl-Demo/PDFSound";
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -252,7 +238,6 @@
 				4F1151582A1D989700EC433D /* AppDelegate.m in Sources */,
 				4F1151802A1D99E700EC433D /* XMLParseManager.m in Sources */,
 				4F1151692A1D989800EC433D /* main.m in Sources */,
-				4F1151922A1DACF600EC433D /* CPDFMediaManager.m in Sources */,
 				4F11515B2A1D989700EC433D /* SceneDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

compdfkit-tools/compdfkit-tools.xcodeproj/project.pbxproj

@@ -125,6 +125,7 @@
 		C9B9EC5A29F54E9600C6A5D2 /* CAnnotStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = C9B9EC5829F54E9600C6A5D2 /* CAnnotStyle.m */; };
 		C9E792D02A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h in Headers */ = {isa = PBXBuildFile; fileRef = C9E792CE2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h */; };
 		C9E792D12A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C9E792CF2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m */; };
+		C9E792D62A1DEBA20013D6A8 /* CPDFMediaManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C9E792D22A1DEAC70013D6A8 /* CPDFMediaManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C9FBA20E2A0D1119003FABEC /* CPDFStampViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FBA20C2A0D1119003FABEC /* CPDFStampViewController.h */; };
 		C9FBA20F2A0D1119003FABEC /* CPDFStampViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9FBA20D2A0D1119003FABEC /* CPDFStampViewController.m */; };
 		C9FBA2122A0D1172003FABEC /* CStampCollectionViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FBA2102A0D1172003FABEC /* CStampCollectionViewCell.h */; };
@@ -374,6 +375,8 @@
 		C9B9EC5829F54E9600C6A5D2 /* CAnnotStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CAnnotStyle.m; sourceTree = "<group>"; };
 		C9E792CE2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFEditImageSampleView.h; sourceTree = "<group>"; };
 		C9E792CF2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFEditImageSampleView.m; sourceTree = "<group>"; };
+		C9E792D22A1DEAC70013D6A8 /* CPDFMediaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFMediaManager.h; sourceTree = "<group>"; };
+		C9E792D32A1DEAC70013D6A8 /* CPDFMediaManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFMediaManager.m; sourceTree = "<group>"; };
 		C9FBA20C2A0D1119003FABEC /* CPDFStampViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFStampViewController.h; sourceTree = "<group>"; };
 		C9FBA20D2A0D1119003FABEC /* CPDFStampViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFStampViewController.m; sourceTree = "<group>"; };
 		C9FBA2102A0D1172003FABEC /* CStampCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CStampCollectionViewCell.h; sourceTree = "<group>"; };
@@ -833,6 +836,15 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		C9E792D42A1DEAC70013D6A8 /* PDFSound */ = {
+			isa = PBXGroup;
+			children = (
+				C9E792D22A1DEAC70013D6A8 /* CPDFMediaManager.h */,
+				C9E792D32A1DEAC70013D6A8 /* CPDFMediaManager.m */,
+			);
+			path = PDFSound;
+			sourceTree = "<group>";
+		};
 		C9FBA20B2A0D10C3003FABEC /* PDFStamp */ = {
 			isa = PBXGroup;
 			children = (
@@ -1111,6 +1123,7 @@
 		F335EE4929E430C800ACC72A /* compdfkit-tools */ = {
 			isa = PBXGroup;
 			children = (
+				C9E792D42A1DEAC70013D6A8 /* PDFSound */,
 				C9AF188829F4C65500EC4979 /* Annotation */,
 				F32DA14629ED904300E19ECA /* Common */,
 				4F06AB4729F6792E007797E4 /* Edit */,
@@ -1259,6 +1272,7 @@
 				F3877E1629E6764E00037D92 /* CPDFDisplayViewController.h in Headers */,
 				F32DA19129ED908800E19ECA /* CPDFMoreListViewController.h in Headers */,
 				F38F5B632A038B0400D0EEFD /* CPDFListView+Private.h in Headers */,
+				C9E792D62A1DEBA20013D6A8 /* CPDFMediaManager.h in Headers */,
 				4F7D57EF2A0D0D76008C76D3 /* CPDFToolsViewController.h in Headers */,
 				F32DA17029ED904300E19ECA /* CPDFThumbnailViewCell.h in Headers */,
 				4FD34DCB2A0B2752005CEAB6 /* CNavigationBarTitleButton.h in Headers */,
@@ -1648,7 +1662,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1681,7 +1695,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

compdfkit-tools/compdfkit-tools/Common/Controls/PDFViewController/CPDFViewBaseController.m

@@ -265,9 +265,6 @@
     self.navigationItem.rightBarButtonItem = rightItem;
 }
 
-- (void)PDFViewCurrentPageDidChanged:(CPDFView *)pdfView {
-}
-
 #pragma mark - CSearchToolbarDelegate
 
 - (void)searchToolbar:(CSearchToolbar *)searchToolbar onSearchQueryResults:(NSArray *)results {

compdfkit-tools/compdfkit-tools/Common/Views/PDFView/PDFListView/CPDFListView+Edit.m

@@ -313,7 +313,32 @@
 
 
 - (void)extractActionClick:(UIMenuItem*)menuItem{
-    [self extractImageWithEditImageArea:(CPDFEditImageArea*)self.editingArea];
+    BOOL saved = [self extractImageWithEditImageArea:(CPDFEditImageArea*)self.editingArea];
+    
+    if(saved){
+        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"Export Successfully!", nil) preferredStyle:UIAlertControllerStyleAlert];
+
+        [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK!", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        }]];
+        
+        UIViewController *tRootViewControl = [UIApplication sharedApplication].keyWindow.rootViewController;
+        if ([tRootViewControl presentedViewController]) {
+            tRootViewControl = [tRootViewControl presentedViewController];
+        }
+
+        [tRootViewControl presentViewController:alertController animated:YES completion:nil];
+    }else{
+        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"Export Failed!", nil) preferredStyle:UIAlertControllerStyleAlert];
+
+        [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK!", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        }]];
+        
+        UIViewController *tRootViewControl = [UIApplication sharedApplication].keyWindow.rootViewController;
+        if ([tRootViewControl presentedViewController]) {
+            tRootViewControl = [tRootViewControl presentedViewController];
+        }
+        [tRootViewControl presentViewController:alertController animated:YES completion:nil];
+    }
 }
 
 - (void)horizontalMirrorClick:(UIMenuItem*)menuItem{

compdfkit-tools/compdfkit-tools/Edit/CPDFEditCell/CPDFTextPropertyCell.m

@@ -160,7 +160,7 @@
         [self.dropMenuView addSubview:self.dropDownIcon];
         
         self.fontNameSelectLabel = [[UILabel alloc] init];
-        self.fontNameSelectLabel.font = [UIFont systemFontOfSize:14];
+        self.fontNameSelectLabel.adjustsFontSizeToFitWidth = YES;
         self.fontNameSelectLabel.textColor = [UIColor blackColor];
         [self.dropMenuView addSubview:self.fontNameSelectLabel];
         

compdfkit-tools/compdfkit-tools/Edit/CPDFEditToolBar/CPDFEditToolBar.m

@@ -104,7 +104,7 @@
     self.splitView.backgroundColor = [UIColor colorWithRed:0. green:0. blue:0. alpha:0.1];
     [self.leftView addSubview:self.splitView];
     
-    [self updateButtonState];
+//    [self updateButtonState];
 }
 
 

compdfkit-tools/compdfkit-tools/Edit/CPDFEditViewController.m

@@ -285,6 +285,7 @@
         
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        
         return cell;
     }else{
         CPDFImagePropertyCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ImageCell"];

compdfkit-tools/compdfkit-tools/compdfkit_tools.h

@@ -72,3 +72,6 @@
 #import <compdfkit_tools/CPDFEditViewController.h>
 #import <compdfkit_tools/CPDFToolsViewController.h>
 #import <compdfkit_tools/CPDFSoundPlayBar.h>
+
+// Sound Manager
+#import <compdfkit_tools/CPDFMediaManager.h>