Browse Source

机型iPhone8云手机模块界面,设置按钮需要优化

huangxiaodong 10 months ago
parent
commit
cce539928c

+ 4 - 4
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -102,12 +102,12 @@ isBangsScreen; \
 //#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //预生产环境
-#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
-#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
+//#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境
-//#define CloudService   @"http://hiboxde.armclouding.com:7780"
-//#define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://hiboxde.armclouding.com:7780"
+#define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"
 

+ 27 - 5
创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m

@@ -46,8 +46,25 @@
         make.bottom.mas_equalTo(0);
     }];
     
+    CGFloat width = SCREEN_W;
+    CGFloat height = SCREEN_H;
+    
+    BOOL isSmallPhoneType = NO;
+    if(width == 375 && height == 667){
+        isSmallPhoneType = YES;
+    }
+    
+    CGFloat adjustSmallScale = 1.0;
+    if(isSmallPhoneType){
+        adjustSmallScale = 0.9;
+    }
+    
     CGFloat imageTopY =  54.0;
     
+    if(isSmallPhoneType){
+        imageTopY = 20.0;
+    }
+    
     //设置按钮
     UIButton *setButton = [[UIButton alloc] init];
     //[setButton setBackgroundImage:[UIImage imageNamed:@"cloudPhone_set"] forState:UIControlStateNormal];
@@ -60,7 +77,12 @@
     [setButton mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.top.mas_equalTo(imageTopY);
-        make.right.mas_equalTo(-16);
+        if(isSmallPhoneType){
+            make.right.mas_equalTo(-5);
+        }
+        else{
+            make.right.mas_equalTo(-16);
+        }
         make.width.mas_equalTo(50);
         make.height.mas_equalTo(50);
         
@@ -77,8 +99,8 @@
     [self.view addSubview:midImageV];
     
     [midImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(326*WAUTOSCALE);
-        make.height.mas_equalTo(608*WAUTOSCALE);
+        make.width.mas_equalTo(326*WAUTOSCALE*adjustSmallScale);
+        make.height.mas_equalTo(608*WAUTOSCALE*adjustSmallScale);
         make.centerX.mas_equalTo(0);
         make.centerY.mas_equalTo(-10);
     }];
@@ -110,8 +132,8 @@
     [midImageV addSubview:midTopTipImageV];
     
     [midTopTipImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(282*WAUTOSCALE);
-        make.height.mas_equalTo(84*WAUTOSCALE);
+        make.width.mas_equalTo(282*WAUTOSCALE*adjustSmallScale);
+        make.height.mas_equalTo(84*WAUTOSCALE*adjustSmallScale);
         make.centerX.mas_equalTo(0);
         make.top.equalTo(midImageV.mas_top).offset(64);
     }];