瀏覽代碼

1.修复bug

huangxiaodong 1 年之前
父節點
當前提交
106160fde7

+ 2 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -2216,7 +2216,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.overseas.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2295,7 +2295,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.overseas.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 2 - 1
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -128,7 +128,8 @@
     //非扫码进入 进入到这里很可能还没联网拿到设备最新信息
     if(![connectDeviceManager shareInstance].DeviceThirdIdMod){
         
-        BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_Mask_View_Open];
+        //BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_Mask_View_Open];
+        NSInteger maskModel =  [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
         //添加默认启动图片
         if(!_customLaunchV && maskModel == 0){
             _customLaunchV = [[customLaunchView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];

+ 6 - 0
创维盒子/双子星云手机/Class/Calculator/CalculatorViewController.m

@@ -126,6 +126,12 @@
 -(void)loadButtons:(CGFloat)mWidth Hight:(CGFloat)mHieght{
     CGFloat x=1;
     CGFloat y=mHieght-(((mWidth-5)/4)*5)-1 - 60;
+    
+    if(mHieght == 736){//修改 8P手机UI问题
+        y += 40;
+    }
+
+    
     NSArray *buttonArray=@[@"C",@"+/-",@"%",@"÷",@"7",@"8",@"9",@"×",@"4",@"5",@"6",@"—",@"1",@"2",@"3",@"+",@"0",@".",@"="];
     NSInteger buttonArrayID=0;
     for (int i=0; i<5; i++) {