1.横屏下退到后台，再次进入会闪现云机首页后再显示输入密码界面 (修改方案更改)

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

@@ -6158,7 +6158,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6215,7 +6215,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3.1;
+				MARKETING_VERSION = 1.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6237,7 +6237,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6294,7 +6294,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3.1;
+				MARKETING_VERSION = 1.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -789,13 +789,13 @@
 - (void)showCalculatorVC{
     HLog(@"showCalculatorVC 处理密码框弹出")
     
-    if(SCREEN_W > SCREEN_H){
-        HLog(@"showCalculatorVC 屏幕还是横屏状态")
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self showCalculatorVC];
-        });
-        return;
-    }
+//    if(SCREEN_W > SCREEN_H){
+//        HLog(@"showCalculatorVC 屏幕还是横屏状态")
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [self showCalculatorVC];
+//        });
+//        return;
+//    }
     
     ksharedAppDelegate.supportScreenRotateType = NO;
     

创维盒子/双子星云手机/Class/Calculator/CalculatorViewController.m

@@ -23,6 +23,12 @@
     self.view.backgroundColor=[UIColor blackColor];
     CGFloat mWidth=self.view.frame.size.width;
     CGFloat mHieght=self.view.frame.size.height;
+    
+    if(mWidth > mHieght){
+        mWidth = self.view.frame.size.height;
+        mHieght = self.view.frame.size.width;
+    }
+    
     //加载button
     [self loadButtons:mWidth Hight:mHieght];
     //加载textField

创维盒子/双子星云手机/Class/Controller/HWWebViewController.m

@@ -232,11 +232,19 @@
 //    self.webView. = NO;
     [self.view addSubview:self.webView];
     
+    CGFloat curWidth = SCREEN_W;
+    CGFloat curHeight = SCREEN_H;
+    if(curWidth > curHeight){
+        curWidth = SCREEN_H;
+        curHeight = SCREEN_W;
+    }
+    
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.navigationBar.mas_bottom);
         make.left.mas_equalTo(0);
-        make.width.mas_equalTo(SCREEN_W);
-        make.bottom.mas_equalTo(self.toolBar.mas_top);
+        make.width.mas_equalTo(curWidth);
+        //make.bottom.mas_equalTo(self.toolBar.mas_top);
+        make.height.mas_equalTo(curHeight - self.navigationBar.hw_h);
     }];
     
     

创维盒子/双子星云手机/Class/Guide/inputPWDViewController.m

@@ -196,10 +196,15 @@
     UIView *bgViewForNumberBoard = [[UIView alloc] init];
     [bgViewForNumberBoard setBackgroundColor:[UIColor clearColor]];
     CGFloat w_bgViewForNumberBoard = SCREEN_W - 2*22.f*AUTOSCALE;
+    CGFloat curAUTOSCALE = AUTOSCALE;
+    if(SCREEN_W > SCREEN_H){
+        curAUTOSCALE = ([[UIScreen mainScreen] bounds].size.height / 375);
+        w_bgViewForNumberBoard =  SCREEN_H - 2*22.f*curAUTOSCALE;
+    }
     CGFloat h_bgViewForNumberBoard = 330.f;
     [self.view addSubview:bgViewForNumberBoard];
     [bgViewForNumberBoard mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(22.f*AUTOSCALE);
+        make.left.mas_equalTo(22.f*curAUTOSCALE);
         make.height.mas_equalTo(h_bgViewForNumberBoard);
         make.width.mas_equalTo(w_bgViewForNumberBoard);
         make.bottom.mas_equalTo(-70.f);