lxy 1 yıl önce
ebeveyn
işleme
0c94ee535d

+ 1 - 0
LenzCameraNativeModuleForRN/Classes/inner/Manager/CameraManager.m

@@ -23,6 +23,7 @@
 - (void)setResolutionFor:(AVCaptureDevicePosition)position with: (NSInteger)desiredHeight model:(SDKCaptureModeIndex)model{
     
     AVCaptureDevice* device = [self cameraWithPosition:position];
+    
     if(device == nil){
         return;
     }

+ 4 - 3
LenzCameraNativeModuleForRN/Classes/inner/PCSBaseViewController/PCSBaseViewController.m

@@ -1615,7 +1615,7 @@
     [[SDKParameters shared].items enumerateObjectsUsingBlock:^(SDKParametersItem * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         if (obj.model == self.mode) {
             [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionBack with:obj.resolution.height model:self.mode];
-            [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionFront with:obj.resolution.height model:self.mode];
+//            [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionFront with:obj.resolution.height model:self.mode];
         }
     }];
     
@@ -1784,8 +1784,9 @@
     if(newIndex != SDK_CAPTURE_MODE_MOVIE){
         [[SDKParameters shared].items enumerateObjectsUsingBlock:^(SDKParametersItem * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             if (obj.model == self.mode) {
+                
                 [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionBack with:obj.resolution.height model:self.mode];
-                [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionFront with:obj.resolution.height model:self.mode];
+//                [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionFront with:obj.resolution.height model:self.mode];
             }
         }];
         
@@ -1794,7 +1795,7 @@
         [[SDKParameters shared].items enumerateObjectsUsingBlock:^(SDKParametersItem * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             if (obj.model == self.mode) {
                 [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionBack with:obj.videoResolution.height model:self.mode];
-                [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionFront with:obj.videoResolution.height model:self.mode];
+//                [[CameraManager shared] setResolutionFor:AVCaptureDevicePositionFront with:obj.videoResolution.height model:self.mode];
             }
         }];
 

+ 11 - 3
LenzCameraNativeModuleForRN/Classes/inner/UI/ModeListView/PCSModeList.m

@@ -76,7 +76,11 @@
                 make.left.equalTo(previous.mas_right).offset(self.space);
             }
             make.centerY.equalTo(self);
-            make.width.mas_offset(60);
+            if (obj.tag == SDK_CAPTURE_MODE_INTELLEGENCE_PANORAMA) {
+                make.width.mas_offset(60);
+            } else {
+                make.width.mas_offset(44);
+            }
             make.height.mas_offset(44);
         }];
         previous = obj;
@@ -86,7 +90,7 @@
 }
 
 - (CGFloat)space{
-    return 10;
+    return 0;
 }
 
 - (void)updateIndexByTanslation:(CGPoint)translation{
@@ -155,7 +159,11 @@
                 make.left.equalTo(previous.mas_right).offset(self.space);
             }
             make.centerY.equalTo(self);
-            make.width.mas_offset(60);
+            if (obj.modeIndex == SDK_CAPTURE_MODE_INTELLEGENCE_PANORAMA) {
+                make.width.mas_offset(60);
+            } else {
+                make.width.mas_offset(44);
+            }
             make.height.mas_offset(44);
         }];
         previous = label;

+ 2 - 1
LenzCameraNativeModuleForRN/Classes/inner/UI/PanoramaOrientaionView/PanoramaOrientationView.m

@@ -112,7 +112,8 @@
     [items.firstObject mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.mas_left);
         make.top.bottom.equalTo(self);
-        make.height.mas_equalTo(30);
+        make.width.mas_offset(44);
+        make.height.mas_equalTo(22);
     }];
     PanoramaOrientationViewItem* previous = items.firstObject;
     for(int i = 1; i < 5; ++i){

+ 2 - 2
LenzCameraNativeModuleForRN/Classes/inner/VC.storyboard

@@ -137,10 +137,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Lp-cE-Qcw" customClass="PanoramaOrientationView">
-                                <rect key="frame" x="82" y="700" width="250" height="30"/>
+                                <rect key="frame" x="97" y="700" width="220" height="30"/>
                                 <color key="backgroundColor" systemColor="systemPurpleColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="250" id="EfH-5x-k3r"/>
+                                    <constraint firstAttribute="width" constant="220" id="EfH-5x-k3r"/>
                                     <constraint firstAttribute="height" constant="30" placeholder="YES" id="eWf-j2-49O"/>
                                 </constraints>
                             </view>