fix bug

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - LenzSDK (1.1.4):
+  - LenzSDK (2.0.0):
     - Masonry (= 1.1.0)
     - OpenCV2 (~> 4.3.0)
     - SVProgressHUD (~> 2.2.5)
@@ -27,7 +27,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  LenzSDK: fa0c26d9c0b7a8f06cc70cf77181a9c869ea4311
+  LenzSDK: e7a4797dfdbd6e488154732cc420fc99e039303a
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   OpenCV2: ffe82e5cb5d16dc3fc01a5f4127b9a5b3cfc7d1b
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6

Example/Pods/Headers/Private/LenzSDK/PCSAutherView.h

@@ -0,0 +1 @@
+../../../../../LenzCameraNativeModuleForRN/Classes/inner/UI/PCSAutherView.h

Example/Pods/Local Podspecs/LenzSDK.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "LenzSDK",
-  "version": "1.1.4",
+  "version": "2.0.0",
   "summary": "A short description of LenzSDK.",
   "description": "this  is the long description",
   "homepage": "http://39.96.8.150:10080/l405023944/LenzSDK_iOS.git",
@@ -13,7 +13,7 @@
   },
   "source": {
     "git": "http://39.96.8.150:10080/l405023944/LenzSDK_iOS.git",
-    "tag": "1.1.4"
+    "tag": "2.0.0"
   },
   "platforms": {
     "ios": "11.0"
@@ -43,10 +43,7 @@
     "AVFoundation",
     "CoreMedia"
   ],
-  "vendored_frameworks": [
-    "LenzTensorFlowSDK.framework",
-    "LenzStitchSDK.framework"
-  ],
+  "vendored_frameworks": "LenzStitchSDK.framework",
   "libraries": [
     "c++",
     "z"

Example/Pods/Manifest.lock

@@ -1,5 +1,5 @@
 PODS:
-  - LenzSDK (1.1.4):
+  - LenzSDK (2.0.0):
     - Masonry (= 1.1.0)
     - OpenCV2 (~> 4.3.0)
     - SVProgressHUD (~> 2.2.5)
@@ -27,7 +27,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  LenzSDK: fa0c26d9c0b7a8f06cc70cf77181a9c869ea4311
+  LenzSDK: e7a4797dfdbd6e488154732cc420fc99e039303a
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   OpenCV2: ffe82e5cb5d16dc3fc01a5f4127b9a5b3cfc7d1b
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6

Example/Pods/Target Support Files/LenzSDK/ResourceBundle-LenzCameraNativeModuleForRN-LenzSDK-Info.plist

@@ -13,7 +13,7 @@
   <key>CFBundlePackageType</key>
   <string>BNDL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.4</string>
+  <string>2.0.0</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Example/Pods/Target Support Files/Pods-LenzCameraNativeModuleForRN_Example/Pods-LenzCameraNativeModuleForRN_Example.debug.xcconfig

@@ -3,7 +3,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.." "${PODS_ROOT}/OpenCV2
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/LenzSDK" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/YYText" '${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework/Headers'
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LenzSDK" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/YYText"
-OTHER_LDFLAGS = $(inherited) -L ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework -ObjC -l"LenzSDK" -l"Masonry" -l"SVProgressHUD" -l"YYText" -l"c++" -l"stdc++" -l"z" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "AssetsLibrary" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreMedia" -framework "CoreMotion" -framework "CoreServices" -framework "CoreTelephony" -framework "CoreText" -framework "CoreVideo" -framework "Foundation" -framework "LenzStitchSDK" -framework "LenzTensorFlowSDK" -framework "MapKit" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "Photos" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -framework "opencv2" -framework "tensorflow_lite" -force_load ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework/tensorflow_lite
+OTHER_LDFLAGS = $(inherited) -L ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework -ObjC -l"LenzSDK" -l"Masonry" -l"SVProgressHUD" -l"YYText" -l"c++" -l"stdc++" -l"z" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "AssetsLibrary" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreMedia" -framework "CoreMotion" -framework "CoreServices" -framework "CoreTelephony" -framework "CoreText" -framework "CoreVideo" -framework "Foundation" -framework "LenzStitchSDK" -framework "MapKit" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "Photos" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -framework "opencv2" -framework "tensorflow_lite" -force_load ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework/tensorflow_lite
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

Example/Pods/Target Support Files/Pods-LenzCameraNativeModuleForRN_Example/Pods-LenzCameraNativeModuleForRN_Example.release.xcconfig

@@ -3,7 +3,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../.." "${PODS_ROOT}/OpenCV2
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/LenzSDK" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SVProgressHUD" "${PODS_ROOT}/Headers/Public/YYText" '${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework/Headers'
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LenzSDK" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/YYText"
-OTHER_LDFLAGS = $(inherited) -L ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework -ObjC -l"LenzSDK" -l"Masonry" -l"SVProgressHUD" -l"YYText" -l"c++" -l"stdc++" -l"z" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "AssetsLibrary" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreMedia" -framework "CoreMotion" -framework "CoreServices" -framework "CoreTelephony" -framework "CoreText" -framework "CoreVideo" -framework "Foundation" -framework "LenzStitchSDK" -framework "LenzTensorFlowSDK" -framework "MapKit" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "Photos" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -framework "opencv2" -framework "tensorflow_lite" -force_load ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework/tensorflow_lite
+OTHER_LDFLAGS = $(inherited) -L ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework -ObjC -l"LenzSDK" -l"Masonry" -l"SVProgressHUD" -l"YYText" -l"c++" -l"stdc++" -l"z" -framework "AVFoundation" -framework "Accelerate" -framework "AdSupport" -framework "AssetsLibrary" -framework "CoreData" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreImage" -framework "CoreMedia" -framework "CoreMotion" -framework "CoreServices" -framework "CoreTelephony" -framework "CoreText" -framework "CoreVideo" -framework "Foundation" -framework "LenzStitchSDK" -framework "MapKit" -framework "MediaPlayer" -framework "MobileCoreServices" -framework "Photos" -framework "QuartzCore" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit" -framework "opencv2" -framework "tensorflow_lite" -force_load ${SRCROOT}/Pods/TensorFlowLite/Frameworks/tensorflow_lite.framework/tensorflow_lite
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

LenzCameraNativeModuleForRN/Classes/inner/PCSBaseViewController/PCSBaseViewController.m

@@ -203,6 +203,18 @@
     [self.modeList reloadWith:self.operationNodesArray];
     self.modeList.indexChangedHandler = ^BOOL(NSUInteger newMode, NSUInteger oldMode, NSUInteger newIndex) {
         __strong typeof(weakself) strongSelf = weakself;
+        if (newMode == SDK_CAPTURE_MODE_MOVIE) {
+            if ([self showAuthBoth]) {
+                return NO;
+            }
+            if ([self showAudioCamerIfNeed]) {
+                return NO;
+            }
+        } else {
+            if ([self showAuthorCamerIfNeed]) {
+                return NO;
+            }
+        }
         
         if ([SDKParameters shared].retainedMode == SDK_DATA_RETAINED_CLEAR) {
             BOOL needAlert = NO;
@@ -230,9 +242,9 @@
                     break;
             }
             if (needAlert) {
-                [QuitMultipleModeAlertViewController show:self title:@"确认提醒" text:@"切换模式会清除已拍摄数据，请确认" leftBtnTitle:@"取消" rightBtnTitle:@"确定" withLeftButtonCallBack:^(QuitMultipleModeAlertViewController * _Nonnull alertController) {
-                    [alertController dismissViewControllerAnimated:NO completion:^{}];
-                } rightButtonCallBack:^(QuitMultipleModeAlertViewController * _Nonnull alertController) {
+//                [QuitMultipleModeAlertViewController show:self title:@"确认提醒" text:@"切换模式会清除已拍摄数据，请确认" leftBtnTitle:@"取消" rightBtnTitle:@"确定" withLeftButtonCallBack:^(QuitMultipleModeAlertViewController * _Nonnull alertController) {
+//                    [alertController dismissViewControllerAnimated:NO completion:^{}];
+//                } rightButtonCallBack:^(QuitMultipleModeAlertViewController * _Nonnull alertController) {
                     switch (self.mode) {
                         case SDK_CAPTURE_MODE_CONTINUOUS: {
                             
@@ -286,8 +298,8 @@
                         [oldModelNode didQuit];
                     }
                     
-                    [alertController dismissViewControllerAnimated:NO completion:^{}];
-                }];
+//                    [alertController dismissViewControllerAnimated:NO completion:^{}];
+//                }];
 
                 return NO;
             }
@@ -412,19 +424,22 @@
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     if(self.cameraPrepared){
+        __block  BOOL isAuthVideo = NO;
+        
         switch ([AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]) {
             case AVAuthorizationStatusAuthorized:
+                isAuthVideo = YES;
                 [self startCaptureSession];
                 [[PCSMotionManager shared] startAccelerometerUpdates];
                 break;
             case AVAuthorizationStatusNotDetermined:{
                 [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
                     if(granted){
+                        isAuthVideo = YES;
                         [self startCaptureSession];
                         [[PCSMotionManager shared] startAccelerometerUpdates];
                     }
                     else{
-                        [self showAuthorCamerIfNeed];
                         [[NSNotificationCenter defaultCenter] postNotificationName:CameraNotificationNotPermission object:self];
                     }
                 }];
@@ -448,9 +463,22 @@
                 [AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio completionHandler:^(BOOL granted) {
                     if(granted){
                         [self setupMicrophone];
+                        if (self.mode != SDK_CAPTURE_MODE_MOVIE) {
+                            if (!isAuthVideo) {
+                                [self showAuthorCamerIfNeed];
+                            }
+                        }
                     }
                     else{
-                        [self showAudioCamerIfNeed];
+                        if (self.mode == SDK_CAPTURE_MODE_MOVIE) {
+                            if (!isAuthVideo) {
+                                [self showAuthBoth];
+                            } else {
+                                [self showAudioCamerIfNeed];
+                            }
+                        } else {
+                            [self showAuthorCamerIfNeed];
+                        }
                         [[NSNotificationCenter defaultCenter] postNotificationName:MicrophoneNotificationNotPermission object:self];
                     }
                 }];
@@ -466,7 +494,18 @@
                 break;
         }
     }
-//    [self showAuthorCamerIfNeed];
+    
+    if (self.mode == SDK_CAPTURE_MODE_MOVIE) {
+        if (![self showAuthBoth]) {
+            [self showAudioCamerIfNeed];
+        }
+    } else {
+        if (![self showAuthBoth]) {
+            [self showAuthorCamerIfNeed];
+        }
+    }
+    
+    
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
@@ -1562,7 +1601,6 @@
             self.panoramaGuideView.hidden = YES;
             self.panoramOrientationGuideView.hidden = YES;
             self.previewLayer.frame = CGRectMake(0, (height - width*4/3)/2, width, width*4/3);
-            [self showAuthorCamerIfNeed];
         }
             
             break;
@@ -1571,7 +1609,6 @@
             self.panoramaGuideView.hidden = YES;
             self.panoramOrientationGuideView.hidden = YES;
             self.previewLayer.frame = CGRectMake(0, (height - width*4/3)/2, width, width*4/3);
-            [self showAuthorCamerIfNeed];
         }
             
             break;
@@ -1580,9 +1617,6 @@
             self.panoramaGuideView.hidden = YES;
             self.panoramOrientationGuideView.hidden = YES;
             self.previewLayer.frame = self.view.layer.bounds;
-            if (![self showAuthBoth]) {
-                [self showAudioCamerIfNeed];
-            }
 
         }
             
@@ -1592,7 +1626,6 @@
             self.panoramaGuideView.hidden = NO;
             self.panoramOrientationGuideView.hidden = NO;
             self.previewLayer.frame = self.view.layer.bounds;
-            [self showAuthorCamerIfNeed];
 
         }
             
@@ -1602,8 +1635,6 @@
             self.panoramaGuideView.hidden = YES;
             self.panoramOrientationGuideView.hidden = YES;
             self.previewLayer.frame = self.view.layer.bounds;
-            [self showAuthorCamerIfNeed];
-
         }
             
             break;

LenzSDK.podspec

@@ -38,10 +38,8 @@ Pod::Spec.new do |s|
   s.public_header_files = 'LenzCameraNativeModuleForRN/Classes/headers/*.h'
   # s.ios.public_header_files = 
   s.frameworks = 'UIKit', 'MapKit', 'WebKit', 'AdSupport', 'Accelerate' ,'MediaPlayer', 'CoreData', 'SystemConfiguration' ,'CoreServices' ,'AssetsLibrary' ,'CoreTelephony' ,'CoreMotion' ,'Photos' ,'AVFoundation' ,'CoreMedia'
-  # s.dependency 'AFNetworking', '~> 2.3'
-  # s.static_framework = true 
-  # s.prefix_header_contents = '#import "PCSSDF-prefix-header.h"'
-  s.vendored_frameworks = 'LenzTensorFlowSDK.framework', "LenzStitchSDK.framework"
+  s.vendored_frameworks = "LenzStitchSDK.framework"
+  # s.vendored_frameworks = 'LenzTensorFlowSDK.framework', "LenzStitchSDK.framework"
   # s.vendored_frameworks = 'LenzTensorFlowSDK.framework', "opencv2.framework", "LenzStitchSDK.framework"
   # s.vendored_frameworks = 'LenzTensorFlow.framework'
   # s.preserve_path = 'LenzCameraNativeModuleForRN/Frameworks/*'

LenzTensorFlowSDK.framework/Headers/LenzTensorFlowSDK.h

@@ -2,7 +2,7 @@
 //  LenzTensorFlowSDK.h
 //  LenzTensorFlowSDK
 //
-//  Created by lr on 2023/3/24.
+//  Created by lr on 2023/4/14.
 //
 
 #import <Foundation/Foundation.h>
@@ -15,5 +15,4 @@ FOUNDATION_EXPORT const unsigned char LenzTensorFlowSDKVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <LenzTensorFlowSDK/PublicHeader.h>
 
-#import <LenzTensorFlowSDK/LenzTensorFlow.h>
 

LenzTensorFlowSDK.framework/_CodeSignature/CodeResources

@@ -4,29 +4,13 @@
 <dict>
 	<key>files</key>
 	<dict>
-		<key>.DS_Store</key>
-		<data>
-		LNH9cnzVUQEFYiUuiwe2ViKO6iM=
-		</data>
-		<key>Headers/LenzTensorFlow.h</key>
-		<data>
-		VeGZRPeUzABprxh5r63OqLeBg1Q=
-		</data>
-		<key>Headers/LenzTensorFlowLib.h</key>
-		<data>
-		LTJK0l+VKSJ9UNVrgCfffrgeqQ4=
-		</data>
 		<key>Headers/LenzTensorFlowSDK.h</key>
 		<data>
-		j7Qo0D0zN0AYc9wVx0Q91ZsXy1s=
+		y9iqg7O6awzYa8kOgmfH1Q8rzQs=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		1D9AB+Or2suQzjRTuFgHPCVF6Q4=
-		</data>
-		<key>LenzTensorFlowSource.bundle/moire_mobilenetv2_79.tflite</key>
-		<data>
-		ouVZ/OhWla/v1ADmJE9o7gtdIsw=
+		+oikVD23M7v1cCpHtbT3Yd9gb9o=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -35,48 +19,15 @@
 	</dict>
 	<key>files2</key>
 	<dict>
-		<key>Headers/LenzTensorFlow.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			VeGZRPeUzABprxh5r63OqLeBg1Q=
-			</data>
-			<key>hash2</key>
-			<data>
-			9NfCsOXoHUYlTW4sukl7NAc6hVyIZcUdFw+3Lr/GURI=
-			</data>
-		</dict>
-		<key>Headers/LenzTensorFlowLib.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			LTJK0l+VKSJ9UNVrgCfffrgeqQ4=
-			</data>
-			<key>hash2</key>
-			<data>
-			yWjk54msJb+5rpTFpv3RMHFjZGoYgRava773DQHSe3k=
-			</data>
-		</dict>
 		<key>Headers/LenzTensorFlowSDK.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			j7Qo0D0zN0AYc9wVx0Q91ZsXy1s=
-			</data>
-			<key>hash2</key>
-			<data>
-			OV5kVxNDAvh/FbwLzas1mIlofoGfEFHTd1Fts/LuA9g=
-			</data>
-		</dict>
-		<key>LenzTensorFlowSource.bundle/moire_mobilenetv2_79.tflite</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			ouVZ/OhWla/v1ADmJE9o7gtdIsw=
+			y9iqg7O6awzYa8kOgmfH1Q8rzQs=
 			</data>
 			<key>hash2</key>
 			<data>
-			9xjmuTCdNBYeZjsQ2I5RSJPCRETf7D2jlKoCmoEvLmc=
+			KnTuQ6OEktU6j9nuQqd52nIVJq94ciNwLezhVEb68JY=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>