1.部分逻辑调整

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

@@ -569,7 +569,7 @@
 - (void)sceneDidDisconnect:(UIScene *)scene  API_AVAILABLE(ios(13.0)){
     HLog(@"sceneDidDisconnect");
     
-    [[connectDeviceManager shareInstance] disconnect];
+    //[[connectDeviceManager shareInstance] disconnect];
 }
 
 

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

@@ -37,7 +37,7 @@
         [self addGuideView];
     }
     
-    [[connectDeviceManager shareInstance] RefreshThridMsg];
+    [[netWorkManager shareInstance] RefreshThridMsg];
     
     _curKeyToForgetPwd = [NSMutableString new];
 }

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

@@ -52,7 +52,7 @@
     [self.webView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew
        context:nil];
     
-    [[connectDeviceManager shareInstance] RefreshThridMsg];
+    [[netWorkManager shareInstance] RefreshThridMsg];
 }
 
 - (void)viewDidAppear:(BOOL)animated{

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

@@ -315,23 +315,62 @@ bool isDownType = YES;
 - (void)nextStep:(NSString *)sn{
     
     KWeakSelf
-    [[connectDeviceManager shareInstance] getThridMsgBySN:sn needReconnect:NO didNetEnd:^(NSInteger didSuc) {
-        if(didSuc == 1){
-            [weakSelf gotoGuideViewFunBy:sn];
-        }else{
-//            if(didSuc == 2){
-//                [[iToast makeText:NSLocalizedString(@"scan_sn_data_error_tip",nil)] show];
-//            }
-//            else{
-//                [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_get_SdnID_fail",nil)] show];
+//    [[connectDeviceManager shareInstance] getThridMsgBySN:sn needReconnect:NO didNetEnd:^(NSInteger didSuc) {
+//        if(didSuc == 1){
+//            [weakSelf gotoGuideViewFunBy:sn];
+//        }else{
+////            if(didSuc == 2){
+////                [[iToast makeText:NSLocalizedString(@"scan_sn_data_error_tip",nil)] show];
+////            }
+////            else{
+////                [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_get_SdnID_fail",nil)] show];
+////            }
+//            if(self->_didScanErrorFun){
+//                self->_didScanErrorFun(didSuc);
 //            }
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                [self.navigationController popViewControllerAnimated:YES];
+//            });
+//        }
+//    }];
+    
+    [[netWorkManager shareInstance] getThridMsgBySN:sn success:^(id  _Nonnull responseObject) {
+        DeviceThirdIdModel *model = responseObject;
+        if([model isKindOfClass:[DeviceThirdIdModel class]]){
+          
+            if(model.status == 0 && model.data){
+                [weakSelf gotoGuideViewFunBy:sn];
+            }
+            else{
+                NSInteger state = 2;
+                if (model.status == 201 || model.status == 202) {
+                    state = model.status;
+                }
+                
+                if(self->_didScanErrorFun){
+                    self->_didScanErrorFun(state);
+                }
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [self.navigationController popViewControllerAnimated:YES];
+                });
+            }
+        }
+        else{
             if(self->_didScanErrorFun){
-                self->_didScanErrorFun(didSuc);
+                self->_didScanErrorFun(2);
             }
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self.navigationController popViewControllerAnimated:YES];
             });
         }
+        
+    } failure:^(NSError * _Nonnull error) {
+        if(self->_didScanErrorFun){
+            self->_didScanErrorFun(0);
+        }
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self.navigationController popViewControllerAnimated:YES];
+        });
     }];
 }
 

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

@@ -37,7 +37,7 @@
     [self drawAnyView];
     
     //每次进入刷新密码
-    [[connectDeviceManager shareInstance] RefreshThridMsg];
+    [[netWorkManager shareInstance] RefreshThridMsg];
 }
 
 - (void)viewWillAppear:(BOOL)animated

创维盒子/双子星云手机/NAS/view/errorAlertTool.m

@@ -72,7 +72,7 @@ static errorAlertTool *shareInstance = nil;
     [cachesFileManager writeLogsWithMsg:[[NSString alloc] initWithFormat:@"showNetErrorAlertFun %ld",type]];
     
     if(linkFailAlretVC
-       ||[connectDeviceManager shareInstance].isReInitType//瑞云重新init 耗时2-7s 他们说的
+       //||[connectDeviceManager shareInstance].isReInitType//瑞云重新init 耗时2-7s 他们说的
        ||(ksharedAppDelegate.isWebSockLinkOKAginType && type == 2) //重连上了但是延时消息来了
        ||linkFailAlretType2VC){
         return;

创维盒子/双子星云手机/netWork/netWorkManager.h

@@ -49,6 +49,10 @@ typedef void (^netWork_Faild) (NSError *error);
 
 #pragma mark  afnetwork  get 请求 音乐播放器下载音频缓存
 - (void)cloudPhoneDownloadAudioByCode:(NSString*)code withSavePath:(NSString*)savePath success:(netWork_Success)success failure:(netWork_Faild)failure;
+
+#pragma mark 根据SN 获取设备信息
+- (void)getThridMsgBySN:(NSString*)snStr success:(netWork_Success)success failure:(netWork_Faild)failure;
+-(void)RefreshThridMsg;
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/netWork/netWorkManager.m

@@ -676,4 +676,60 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
    //5.开始启动下载任务
    [task resume];
 }
+
+#pragma mark 根据SN 获取设备信息
+- (void)getThridMsgBySN:(NSString*)snStr success:(netWork_Success)success failure:(netWork_Faild)failure;
+{
+    NSMutableDictionary *paraDict = [NSMutableDictionary new];
+    [paraDict setValue:snStr forKey:@"sn"];
+    KWeakSelf
+    [[netWorkManager shareInstance] CommonGetWithCallBackCode:getThirdIdBySn Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        
+        DeviceThirdIdModel *model = [[DeviceThirdIdModel alloc] initWithDictionary:responseObject error:nil];
+
+        if(model.status == 0
+           && model.data)
+        {//根据SN 获取到正确的信息
+            ksharedAppDelegate.DeviceThirdIdMod = model;
+            
+            NSString*desPwdstr = [RSATool AES128Decrypt:model.data.password key:AESCODEKEEYY];
+            
+            /*密码保持在本地*/
+            NSDictionary *deviceDict = [HWDataManager getObjectWithKey:Const_Have_Add_Device];
+            NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithDictionary:deviceDict];
+            [dict setObject:desPwdstr forKey:Const_Have_Add_Device_PWD];
+           
+            NSString *sdnid = model.data.sdnId;
+            
+            if(sdnid){
+                [dict setObject:sdnid forKey:Const_Have_Add_Device_sdnid];
+            }
+            
+            [HWDataManager setObjectWithKey:Const_Have_Add_Device_Privacy_Mode value:[NSNumber numberWithBool:model.data.isPrivacyMode]];
+            
+            [HWDataManager setObjectWithKey:Const_Have_Add_Device value:dict];
+        }
+        else{
+            
+        }
+        
+        success(model);
+        
+    } failure:^(NSError * _Nonnull error) {
+        HLog("网络报错");
+        failure(error);
+    }];
+}
+
+-(void)RefreshThridMsg
+{
+    NSString *sn = ksharedAppDelegate.DeviceThirdIdMod.data.changeSn;
+    if(sn && sn.length>0){
+        [self getThridMsgBySN:sn success:^(id  _Nonnull responseObject) {
+            
+        } failure:^(NSError * _Nonnull error) {
+            
+        }];
+    }
+}
 @end