2.4.5

LenzCameraNativeModuleForRN/Classes/inner/PCSBaseViewController/PCSBaseViewController.m

@@ -131,6 +131,7 @@
 @property (nonatomic) LenzTensorFlow *tensorFlow;
 @property (nonatomic) BOOL isContainSingleInReatinMode;
 @property (nonatomic) UILabel *aiPanPromtLabel;
+@property (nonatomic) UILabel *aiRecordPromtLabel;
 
 @property (nonatomic) PCSAutherView *authView;
 
@@ -200,9 +201,10 @@
     [self.aiPanPromtLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self.view);
         make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-        make.width.mas_offset(350);
+        make.width.mas_offset(240);
         make.height.mas_offset(20);
     }];
+    
     [self.view addSubview:self.authView];
     __weak typeof(self) weakSelf = self;
     self.authView.closeBlock = ^{
@@ -415,6 +417,14 @@
     [self.svContentView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.mas_equalTo(self.view);
     }];
+    
+    [self.view addSubview:self.aiRecordPromtLabel];
+    [self.aiRecordPromtLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.center.mas_equalTo(self.numberOfImagesLabel);
+        make.width.mas_offset(280);
+        make.height.mas_offset(20);
+    }];
+    
     [SVProgressHUD setContainerView:self.svContentView];
     
     self.currentTgDirection = TgDirectionPortrait;
@@ -607,6 +617,20 @@
     return _aiPanPromtLabel;
 }
 
+- (UILabel *)aiRecordPromtLabel {
+    if (!_aiRecordPromtLabel) {
+        _aiRecordPromtLabel = [[UILabel alloc]init];
+        _aiRecordPromtLabel.backgroundColor = [UIColor colorWithRed:33/255.0 green:33/255.0 blue:33/255.0 alpha:.2];
+        _aiRecordPromtLabel.layer.cornerRadius = 6;
+        _aiRecordPromtLabel.layer.masksToBounds = YES;
+        _aiRecordPromtLabel.textColor = [UIColor whiteColor];
+        _aiRecordPromtLabel.font = [UIFont systemFontOfSize:14];
+        _aiRecordPromtLabel.text = @"已启动全景模式，再次点击快门将完成录制";
+        _aiRecordPromtLabel.hidden = YES;
+        _aiRecordPromtLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _aiRecordPromtLabel;
+}
 - (UILabel *)stitchLabel {
     if (!_stitchLabel) {
         _stitchLabel = [[UILabel alloc]init];
@@ -1498,7 +1522,8 @@
     });
     [self stopMotion];
     [self.panoramaGuideView showImageWith:nil];
-    self.aiPanPromtLabel.text = @"请保持手机与拍摄物平行，匀速拍摄";
+    
+    self.aiRecordPromtLabel.hidden = YES;
 //    [self updateViewStatus];
 
 }
@@ -1923,7 +1948,7 @@
             [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                 make.centerX.mas_equalTo(self.view);
                 make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-                make.width.mas_offset(width);
+                make.width.mas_offset(240);
                 make.height.mas_offset(20);
             }];
             self.modeLabel.transform = CGAffineTransformMakeRotation(0);
@@ -1957,7 +1982,7 @@
             [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                 make.centerX.mas_equalTo(self.view);
                 make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-                make.width.mas_offset(width);
+                make.width.mas_offset(240);
                 make.height.mas_offset(20);
             }];
             self.modeLabel.transform = CGAffineTransformMakeRotation(0);
@@ -1983,7 +2008,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerY.mas_equalTo(self.view);
                     make.right.mas_offset(-(width-200));
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(-M_PI/2);
@@ -2004,7 +2029,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerY.mas_equalTo(self.view);
                     make.right.mas_offset(-(width-200));
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(-M_PI/2);
@@ -2024,7 +2049,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerX.mas_equalTo(self.view);
                     make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(0);
@@ -2045,7 +2070,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerX.mas_equalTo(self.view);
                     make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(0);
@@ -2074,7 +2099,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerY.mas_equalTo(self.view);
                     make.left.mas_offset(width-200);
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(M_PI/2);
@@ -2095,7 +2120,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerY.mas_equalTo(self.view);
                     make.left.mas_offset(width-200);
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(M_PI/2);
@@ -2115,7 +2140,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerX.mas_equalTo(self.view);
                     make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(0);
@@ -2135,7 +2160,7 @@
                 [self.aiPanPromtLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
                     make.centerX.mas_equalTo(self.view);
                     make.top.mas_equalTo(self.modeLabel.mas_bottom).mas_offset(20);
-                    make.width.mas_offset(width);
+                    make.width.mas_offset(240);
                     make.height.mas_offset(20);
                 }];
                 self.modeLabel.transform = CGAffineTransformMakeRotation(0);
@@ -2371,7 +2396,7 @@
         }
         
         if (self.mode == SDK_CAPTURE_MODE_INTELLEGENCE_PANORAMA) {
-            
+            self.aiRecordPromtLabel.hidden = YES;
             OperationNodeAIPanorama *aiPan = nil;
             if ([self.currentOperationNode isKindOfClass:[OperationNodeAIPanorama class]]) {
                 aiPan = self.currentOperationNode;
@@ -2402,10 +2427,6 @@
 
                 OperationNodeAIPanorama *aiPan = nil;
                 if ([self.currentOperationNode isKindOfClass:[OperationNodeAIPanorama class]]) {
-                    self.aiPanPromtLabel.text = @"已启动全景模式，再次点击快门将完成录制";
-                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                        self.aiPanPromtLabel.text = @"请保持手机与拍摄物平行，匀速拍摄";
-                    });
                     [LenStitcher videoResetPath];
                     LenzResourceItemModel *itemModel = [[LenzResourceItemModel alloc]init];
                     itemModel.isStitch = YES;
@@ -2414,6 +2435,10 @@
                     aiPan = self.currentOperationNode;
                     aiPan.AIType = OperationAITypeLongPress;
                     [self.currentOperationNode takePhotoButtonTouched];
+                    self.aiRecordPromtLabel.hidden = NO;
+                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        self.aiRecordPromtLabel.hidden = YES;
+                    });
                 }
 
             }
@@ -2642,7 +2667,7 @@
                 self.numberOfImagesLabel.hidden = NO;
                 self.numberOfImagesLabel.text = [NSString stringWithFormat:@"已拍摄%ld张", self.resourceModel.aiPanoramArray.count];
             } else {
-                self.numberOfImagesLabel.text = @"轻点拍照，长按录制";
+                self.numberOfImagesLabel.text = @"单击拍照，长按全景";
                 self.numberOfImagesLabel.hidden = NO;
             }
         }
@@ -3177,6 +3202,7 @@
                             [self.panoramaGuideView clearImage];
                             [self updateViewStatus];
                             [self.panoramaGuideView showImageWith:nil];
+                            self.aiRecordPromtLabel.hidden = YES;
                         });
                         
                         [SVProgressHUD dismissWithDelay:3 completion:^{

LenzSDK.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'LenzSDK'
-  s.version          = '2.4.4'
+  s.version          = '2.4.5'
   s.summary          = 'A short description of LenzSDK.'
 
 # This description is used to generate tags and improve search results.