1.修复输入密码页面点击扫码 扫描不正确的二维码 没有调整提示页面问题--需要同步到主干

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

@@ -1339,7 +1339,6 @@
 		A08A950327E9A4E400C544BB /* FMDatabasePool.m in Sources */ = {isa = PBXBuildFile; fileRef = A08A94F927E9A4E400C544BB /* FMDatabasePool.m */; };
 		A08A950427E9A4E400C544BB /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = A08A94FA27E9A4E400C544BB /* FMResultSet.m */; };
 		A0951D9427ED61F5000E6AC4 /* HWAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0951D9227ED61F5000E6AC4 /* HWAboutViewController.m */; };
-		FF9E820CFBE22690EBBB63B3 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -5727,7 +5726,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5806,7 +5805,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -1143,10 +1143,11 @@
 - (void)scanChangeDeviceFun:(NSNotification*)not
 {
     
-    //TipsQRCodeForChangeDeviceViewController *nextVC = [[TipsQRCodeForChangeDeviceViewController alloc] init];
-    QRCodeScanForChangeDeviceViewController *nextVC = [[QRCodeScanForChangeDeviceViewController alloc] init];
+    TipsQRCodeForChangeDeviceViewController *nextVC = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+    //QRCodeScanForChangeDeviceViewController *nextVC = [[QRCodeScanForChangeDeviceViewController alloc] init];
     nextVC.isRootVCType = YES;
     BaseNavigationController *nextNav = [[BaseNavigationController alloc] initWithRootViewController:nextVC];
+    [nextVC qrcodeBtnPressed];
     self.window.rootViewController = nextNav;
     
 }

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

@@ -616,7 +616,6 @@
     //TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
     QRCodeScanForChangeDeviceViewController *vc = [[QRCodeScanForChangeDeviceViewController alloc] init];
     
-    
     if(self.navigationController){
         [self.navigationController pushViewController:vc animated:YES];
     }

创维盒子/双子星云手机/Class/Set/ChangeDevice/TipsQRCodeForChangeDeviceViewController.h

@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,assign)BOOL isRootVCType;
 @property(nonatomic,assign)BOOL isNeedToShowAleatType;
 @property(nonatomic,assign)NSInteger getSNMsgcode;
+
+- (void)qrcodeBtnPressed;
 @end
 
 NS_ASSUME_NONNULL_END