update config for IOS

thuanpm
Commit c2eda9a63533dc1be9f5868cdd7412b3c3c766f7 c2eda9a6 1 parent 53074773
Showing 11 changed files with 195 additions and 31 deletions
android/CMakeLists.txt
example/ios/Flutter/AppFrameworkInfo.plist
example/ios/Podfile.lock
example/ios/Runner.xcodeproj/project.pbxproj
example/ios/Runner.xcworkspace/contents.xcworkspacedata
example/ios/Runner/Info.plist
ios/Classes/converter.c → ios/native/converter.c
ios/Classes/converter.h → ios/native/converter.h
ios/processing_camera_image.podspec
lib/processing_camera_image.dart
lib/processing_camera_image_i.dart
--- a/android/CMakeLists.txt
View file @c2eda9a
+++ b/android/CMakeLists.txt
View file @c2eda9a
@@ -3,5 +3,5 @@ add_library( convertImage
     # Sets the library as a shared library.
     SHARED
     # Provides a relative path to your source file(s).
-    ../ios/Classes/converter.c
+    ../ios/native/converter.c
 )
--- a/example/ios/Flutter/AppFrameworkInfo.plist
View file @c2eda9a
+++ b/example/ios/Flutter/AppFrameworkInfo.plist
View file @c2eda9a
@@ -2,25 +2,27 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>9.0</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>App</string>
+	<key>CFBundleIdentifier</key>
+	<string>io.flutter.flutter.app</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>App</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
 </dict>
 </plist>
--- a/example/ios/Podfile.lock 0 → 100644
View file @c2eda9a
+++ b/example/ios/Podfile.lock 0 → 100644
View file @c2eda9a
+PODS:
+  - camera (0.0.1):
+    - Flutter
+  - Flutter (1.0.0)
+  - processing_camera_image (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - camera (from `.symlinks/plugins/camera/ios`)
+  - Flutter (from `Flutter`)
+  - processing_camera_image (from `.symlinks/plugins/processing_camera_image/ios`)
+
+EXTERNAL SOURCES:
+  camera:
+    :path: ".symlinks/plugins/camera/ios"
+  Flutter:
+    :path: Flutter
+  processing_camera_image:
+    :path: ".symlinks/plugins/processing_camera_image/ios"
+
+SPEC CHECKSUMS:
+  camera: 9993f92f2c793e87b65e35f3a23c70582afb05b1
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  processing_camera_image: 095bec249ab49bcd51493397d8f1d5f954172a8e
+
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+
+COCOAPODS: 1.11.3
--- a/example/ios/Runner.xcodeproj/project.pbxproj
View file @c2eda9a
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
View file @c2eda9a
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 /* Begin PBXBuildFile section */
@@ -13,6 +13,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		DBBEE26BA65F30848B735563 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A19C00B4DF1E7F67B7FB4F4 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
@@ -31,10 +32,13 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2A5D66613F990B7EE01C4239 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		4A19C00B4DF1E7F67B7FB4F4 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		8D9B524906DEA065966A40C5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -42,6 +46,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A9540954C5C72210B90E12CE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,12 +54,31 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DBBEE26BA65F30848B735563 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		4612BC91B557E0747921F8EF /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				2A5D66613F990B7EE01C4239 /* Pods-Runner.debug.xcconfig */,
+				8D9B524906DEA065966A40C5 /* Pods-Runner.release.xcconfig */,
+				A9540954C5C72210B90E12CE /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		53CFE932C0C7FF34D0E1E16C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				4A19C00B4DF1E7F67B7FB4F4 /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -72,6 +96,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				4612BC91B557E0747921F8EF /* Pods */,
+				53CFE932C0C7FF34D0E1E16C /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -105,12 +131,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				EBD6C8B6886F33A70E06AC90 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				54F95E9059B6D8624F6E9011 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -183,6 +211,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		54F95E9059B6D8624F6E9011 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -197,6 +242,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		EBD6C8B6886F33A70E06AC90 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -288,6 +355,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 2A43564TP9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -416,6 +484,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 2A43564TP9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -438,6 +507,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 2A43564TP9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
--- a/example/ios/Runner.xcworkspace/contents.xcworkspacedata
View file @c2eda9a
+++ b/example/ios/Runner.xcworkspace/contents.xcworkspacedata
View file @c2eda9a
@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
--- a/example/ios/Runner/Info.plist
View file @c2eda9a
+++ b/example/ios/Runner/Info.plist
View file @c2eda9a
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSCameraUsageDescription</key>
+	<string>your usage description here</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>your usage description here</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
--- a/ios/Classes/converter.c → ios/native/converter.c
View file @c2eda9a
+++ b/ios/Classes/converter.c → ios/native/converter.c
View file @c2eda9a
--- a/ios/Classes/converter.h → ios/native/converter.h
View file @c2eda9a
+++ b/ios/Classes/converter.h → ios/native/converter.h
View file @c2eda9a
--- a/ios/processing_camera_image.podspec
View file @c2eda9a
+++ b/ios/processing_camera_image.podspec
View file @c2eda9a
@@ -5,20 +5,26 @@
 Pod::Spec.new do |s|
   s.name             = 'processing_camera_image'
   s.version          = '0.0.1'
-  s.summary          = 'A new Flutter project.'
+  s.summary          = 'A flutter plugin for process fast camera image from plugin camera of google'
   s.description      = <<-DESC
 A new Flutter project.
                        DESC
-  s.homepage         = 'http://example.com'
+  s.homepage         = 'http://github.com/thuanpham98/processing_camera_image'
   s.license          = { :file => '../LICENSE' }
-  s.author           = { 'Your Company' => 'email@example.com' }
+  s.author           = { 'thuanpm' => 'pmttmp24@gmail.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/ProcessingCameraImagePlugin.h'
+  s.public_header_files = 'Classes/**/*.h'
+  s.source_files = ['Classes/**/*', 'native/**/*.{c,h}',]
+  # s.public_header_files = 'Classes/ProcessingCameraImagePlugin.h'
   s.dependency 'Flutter'
   s.platform = :ios, '9.0'
   # Flutter.framework does not contain a i386 slice.
-  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.pod_target_xcconfig = { 
+    'HEADER_SEARCH_PATHS' => [
+    '$(PODS_TARGET_SRCROOT)/native',
+  ],
+  'DEFINES_MODULE' => 'YES', 
+  'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
   s.swift_version = '5.0'
 end
--- a/lib/processing_camera_image.dart
View file @c2eda9a
+++ b/lib/processing_camera_image.dart
View file @c2eda9a
@@ -6,7 +6,7 @@ import 'package:processing_camera_image/processing_camera_image_i.dart';
 abstract class ProcessingCameraImage {
   factory ProcessingCameraImage() => IProcessingCameraImage();
-  /// [ProcessCameraImageToRGB].
+  /// [processCameraImageToRGB]. for Android with YUV420.
   imglib.Image? processCameraImageToRGB({
     int? width,
     int? height,
@@ -19,7 +19,7 @@ abstract class ProcessingCameraImage {
     int? bytesPerPixelPlan1,
   });
-  /// [processCameraImageToGray].
+  /// [processCameraImageToGray]. for Android with YUV420.
   imglib.Image? processCameraImageToGray({
     int? width,
     int? height,
@@ -27,7 +27,23 @@ abstract class ProcessingCameraImage {
     double? rotationAngle,
   });
-  // /// [processCameraImageToGray8Bit].
+  /// [processCameraImageToRGBIOS]. for IOS with YUV420.
+  imglib.Image? processCameraImageToRGBIOS({
+    int? width,
+    int? height,
+    Uint8List? plane0,
+    double? rotationAngle,
+  });
+
+  /// [processCameraImageToGrayIOS]. for IOS with YUV420.
+  imglib.Image? processCameraImageToGrayIOS({
+    int? width,
+    int? height,
+    Uint8List? plane0,
+    double? rotationAngle,
+  });
+
+  /// [processCameraImageToGray8Bit]. for Android with YUV420.
   Uint8List? processCameraImageToGray8Bit({
     int? width,
     int? height,
--- a/lib/processing_camera_image_i.dart
View file @c2eda9a
+++ b/lib/processing_camera_image_i.dart
View file @c2eda9a
@@ -174,4 +174,39 @@ class IProcessingCameraImage implements ProcessingCameraImage {
     return imgData;
   }
+
+  /// [processCameraImageToRGBIOS]. for IOS with YUV420.
+  @override
+  imglib.Image? processCameraImageToRGBIOS({
+    int? width,
+    int? height,
+    Uint8List? plane0,
+    double? rotationAngle,
+  }) {
+    if (width == null || height == null || plane0 == null || plane0.isEmpty) {
+      return null;
+    }
+    if (rotationAngle != null) {
+      imglib.copyRotate(
+          imglib.Image.fromBytes(width, height, List<int>.from(plane0)),
+          rotationAngle);
+    }
+    return imglib.Image.fromBytes(width, height, List<int>.from(plane0));
+  }
+
+  /// [processCameraImageToGrayIOS]. for IOS with YUV420.
+  @override
+  imglib.Image? processCameraImageToGrayIOS({
+    int? width,
+    int? height,
+    Uint8List? plane0,
+    double? rotationAngle,
+  }) {
+    return processCameraImageToGray(
+      height: height,
+      width: width,
+      plane0: plane0,
+      rotationAngle: rotationAngle,
+    );
+  }
 }