Browse Source

【IOS端】输入密码界面右上角的扫码进入,需直接进入扫码界面,去掉更换设备界面

huangxiaodong 11 months ago
parent
commit
6bc1781437

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

@@ -40,6 +40,7 @@
 #import "lastFileManager.h"
 #import "customDownloadManager.h"
 #import "audioPlayListManager.h"
+#import "QRCodeScanForChangeDeviceViewController.h"
 
 @interface SceneDelegate ()<SetUsePWDViewControllerDelegate,GuideViewControllerDelegate,UITabBarControllerDelegate>
 @property(nonatomic, strong)   CalculatorViewController *calculatorVC;
@@ -1044,7 +1045,8 @@
 - (void)scanChangeDeviceFun:(NSNotification*)not
 {
     
-    TipsQRCodeForChangeDeviceViewController *nextVC = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+    //TipsQRCodeForChangeDeviceViewController *nextVC = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+    QRCodeScanForChangeDeviceViewController *nextVC = [[QRCodeScanForChangeDeviceViewController alloc] init];
     nextVC.isRootVCType = YES;
     BaseNavigationController *nextNav = [[BaseNavigationController alloc] initWithRootViewController:nextVC];
     self.window.rootViewController = nextNav;

+ 5 - 1
创维盒子/双子星云手机/Class/Guide/inputPWDViewController.m

@@ -13,6 +13,8 @@
 #import "TipsQRCodeForChangeDeviceViewController.h"
 #import "BaseNavigationController.h"
 
+#import "QRCodeScanForChangeDeviceViewController.h"
+
 @interface inputPWDViewController (){
     NSString *pwd;
     UILabel *pointView0;
@@ -653,7 +655,9 @@
 - (void)scanToChangeDeviceFun
 {
     
-    TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+    //TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
+    QRCodeScanForChangeDeviceViewController *vc = [[QRCodeScanForChangeDeviceViewController alloc] init];
+    
     
     if(self.navigationController){
         [self.navigationController pushViewController:vc animated:YES];

+ 1 - 0
创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.h

@@ -10,6 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QRCodeScanForChangeDeviceViewController : BaseViewController
+@property(nonatomic,assign)BOOL isRootVCType;
 @property (nonatomic,copy) void (^didScanErrorFun)(NSInteger code);
 @end
 

+ 10 - 0
创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -72,6 +72,16 @@
     [_scanLineTimer  invalidate];
 }
 
+- (void)backBtnPressed
+{
+    [super backBtnPressed];
+    
+    if(_isRootVCType){
+        //发个通知
+        [[NSNotificationCenter defaultCenter] postNotificationName:scanChangeDeviceBackNotification object:nil];
+    }
+}
+
 //开始扫描二维码
 
 -(void)startScan{