|
|
@@ -128,6 +128,7 @@
|
|
|
@property (nonatomic) NSNumber *startRollY;
|
|
|
@property (nonatomic) LenzTensorFlow *tensorFlow;
|
|
|
@property (nonatomic) BOOL isContainSingleInReatinMode;
|
|
|
+@property (nonatomic) UILabel *aiPanPromtLabel;
|
|
|
|
|
|
@end
|
|
|
|
|
|
@@ -170,6 +171,13 @@
|
|
|
[self panoramaOrientationViewslt:(PanoramaOrientationViewLeft)];
|
|
|
self.panoramaGuideView.hidden = YES;
|
|
|
|
|
|
+ [self.view addSubview:self.aiPanPromtLabel];
|
|
|
+ [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(240);
|
|
|
+ make.height.mas_offset(20);
|
|
|
+ }];
|
|
|
if (!JK_IS_IPHONE_X) {
|
|
|
self.safeBottom.constant = 25;
|
|
|
self.safeTop.constant = 15;
|
|
|
@@ -264,7 +272,8 @@
|
|
|
PhotographModeEnum mode = (PhotographModeEnum)MODE_LIST_INDEX_2_MODE_ENUM(newMode);
|
|
|
strongSelf.mode = mode;
|
|
|
|
|
|
- self.ai_fullView.hidden = !(mode == SDK_CAPTURE_MODE_PANORAMA);
|
|
|
+// self.ai_fullView.hidden = !(mode == SDK_CAPTURE_MODE_PANORAMA);
|
|
|
+ self.ai_fullView.hidden = YES;
|
|
|
[strongSelf modeDidChange:newMode oldIndex:oldMode];
|
|
|
[strongSelf updateCaptureSessionWith:oldMode];
|
|
|
if([oldModelNode respondsToSelector:@selector(didQuit)]){
|
|
|
@@ -284,7 +293,8 @@
|
|
|
PhotographModeEnum mode = (PhotographModeEnum)MODE_LIST_INDEX_2_MODE_ENUM(newMode);
|
|
|
strongSelf.mode = mode;
|
|
|
|
|
|
- self.ai_fullView.hidden = !(mode == SDK_CAPTURE_MODE_PANORAMA);
|
|
|
+// self.ai_fullView.hidden = !(mode == SDK_CAPTURE_MODE_PANORAMA);
|
|
|
+ self.ai_fullView.hidden = YES;
|
|
|
[strongSelf modeDidChange:newMode oldIndex:oldMode];
|
|
|
[strongSelf updateCaptureSessionWith:oldMode];
|
|
|
if([oldModelNode respondsToSelector:@selector(didQuit)]){
|
|
|
@@ -442,6 +452,8 @@
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ [self showAuthorCamerIfNeed];
|
|
|
}
|
|
|
|
|
|
- (void)viewWillDisappear:(BOOL)animated{
|
|
|
@@ -516,7 +528,20 @@
|
|
|
}
|
|
|
return _loadingAnimation;
|
|
|
}
|
|
|
-
|
|
|
+- (UILabel *)aiPanPromtLabel {
|
|
|
+ if (!_aiPanPromtLabel) {
|
|
|
+ _aiPanPromtLabel = [[UILabel alloc]init];
|
|
|
+ _aiPanPromtLabel.backgroundColor = [UIColor colorWithRed:33/255.0 green:33/255.0 blue:33/255.0 alpha:.2];
|
|
|
+ _aiPanPromtLabel.layer.cornerRadius = 6;
|
|
|
+ _aiPanPromtLabel.layer.masksToBounds = YES;
|
|
|
+ _aiPanPromtLabel.textColor = [UIColor whiteColor];
|
|
|
+ _aiPanPromtLabel.font = [UIFont systemFontOfSize:14];
|
|
|
+ _aiPanPromtLabel.text = @"请保持手机与拍摄物平行，匀速拍摄";
|
|
|
+ _aiPanPromtLabel.hidden = YES;
|
|
|
+ _aiPanPromtLabel.textAlignment = NSTextAlignmentCenter;
|
|
|
+ }
|
|
|
+ return _aiPanPromtLabel;
|
|
|
+}
|
|
|
|
|
|
- (UILabel *)stitchLabel {
|
|
|
if (!_stitchLabel) {
|
|
|
@@ -1258,7 +1283,8 @@
|
|
|
self.panoramaGuideView.hidden = YES;
|
|
|
} else {
|
|
|
self.panoramOrientationGuideView.hidden = isSaveIng;
|
|
|
- self.ai_fullView.hidden = isSaveIng;
|
|
|
+// self.ai_fullView.hidden = isSaveIng;
|
|
|
+ self.ai_fullView.hidden = YES;
|
|
|
self.panoramaGuideView.hidden = isSaveIng;
|
|
|
}
|
|
|
self.modeList.hidden = isSaveIng;
|
|
|
@@ -1288,7 +1314,8 @@
|
|
|
self.panoramOrientationGuideView.hidden = YES;
|
|
|
self.panoramaGuideView.hidden = YES;
|
|
|
} else {
|
|
|
- self.ai_fullView.hidden = NO;
|
|
|
+// self.ai_fullView.hidden = NO;
|
|
|
+ self.ai_fullView.hidden = YES;
|
|
|
self.panoramOrientationGuideView.hidden = NO;
|
|
|
self.panoramaGuideView.hidden = NO;
|
|
|
}
|
|
|
@@ -1458,7 +1485,8 @@
|
|
|
self.albumButton.hidden = YES;
|
|
|
self.numberOfImagesLabel.hidden = YES;
|
|
|
self.modeLabel.text = self.currentOperationNode.modeTitleString;
|
|
|
- self.ai_fullView.hidden = !(self.mode == SDK_CAPTURE_MODE_PANORAMA);
|
|
|
+// self.ai_fullView.hidden = !(self.mode == SDK_CAPTURE_MODE_PANORAMA);
|
|
|
+ self.ai_fullView.hidden = YES;
|
|
|
self.panGesture.enabled = YES;
|
|
|
|
|
|
// self.controller.savePhotoButton.hidden = !self.hasCache;
|
|
|
@@ -2079,6 +2107,7 @@
|
|
|
|
|
|
|
|
|
- (void)updateNumberLabel {
|
|
|
+ self.aiPanPromtLabel.hidden = YES;
|
|
|
switch (self.mode) {
|
|
|
case SDK_CAPTURE_MODE_CONTINUOUS: {
|
|
|
if (self.resourceModel.continousArray.count > 0) {
|
|
|
@@ -2113,6 +2142,7 @@
|
|
|
break;
|
|
|
case SDK_CAPTURE_MODE_INTELLEGENCE_PANORAMA:
|
|
|
{
|
|
|
+ self.aiPanPromtLabel.hidden = NO;
|
|
|
if (self.resourceModel.aiPanoramArray.count > 0) {
|
|
|
self.numberOfImagesLabel.hidden = NO;
|
|
|
self.numberOfImagesLabel.text = [NSString stringWithFormat:@"已拍摄%ld张", self.resourceModel.aiPanoramArray.count];
|
|
|
@@ -2685,9 +2715,9 @@
|
|
|
[SVProgressHUD dismissWithDelay:3 completion:^{
|
|
|
}];
|
|
|
} else if(result == LenVideoStitchResultSlowMore) {
|
|
|
- [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"移动速度过快，请匀速拍摄"];
|
|
|
+ [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"目标物较少，请对准目标物低速且匀速拍摄"];
|
|
|
} else if (result == LenVideoStitchResultSlow) {
|
|
|
- [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"图像中目标物体较少，请对准货架进行拍摄"];
|
|
|
+ [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"目标物较少，请对准目标物低速且匀速拍摄"];
|
|
|
} else {
|
|
|
// [SVProgressHUD showImage:[UIImage imageNamed:@""] status:@"请勿往反方向移动"];
|
|
|
}
|
lxy