1.关于输入密码相关的getThridMsgBySN 优化处理

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

@@ -89,7 +89,7 @@
     NSString *SNStr = deviceDict[@"Const_Have_Add_Device_SN"];
     NSString *sdnId = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sdnId;
     if(SNStr && !sdnId){
-        [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr didNetEnd:^(bool didSuc) {
+        [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:YES didNetEnd:^(bool didSuc) {
             
         }];
     }
@@ -148,7 +148,7 @@
     if(!sdnId){
         HLog(@"没有拿到sdnId");
         
-        [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr didNetEnd:^(bool didSuc) {
+        [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:YES didNetEnd:^(bool didSuc) {
             
         }];
         

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

@@ -342,7 +342,7 @@
         NSString *SNStr = deviceDict[@"Const_Have_Add_Device_SN"];
         
         if(SNStr){
-            [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr didNetEnd:^(bool didSuc) {
+            [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:NO didNetEnd:^(bool didSuc) {
                 
                 if(didSuc){
                     NSString *curPwd = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.password;

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

@@ -308,7 +308,7 @@
         NSString *SNStr = deviceDict[@"Const_Have_Add_Device_SN"];
         
         if(SNStr){
-            [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr didNetEnd:^(bool didSuc) {
+            [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:NO didNetEnd:^(bool didSuc) {
                 
                 if(didSuc){
                     NSString *curPwd = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.password;

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

@@ -37,7 +37,7 @@
     
     
     if([[connectDeviceManager shareInstance] curConnectDeviceState] == DeviceConnectUnknown){
-        [[connectDeviceManager shareInstance] getThridMsgBySN:sn didNetEnd:^(bool didSuc) {
+        [[connectDeviceManager shareInstance] getThridMsgBySN:sn needReconnect:YES didNetEnd:^(bool didSuc) {
             
         }];
     }
@@ -64,7 +64,7 @@
             HLog(@"没有拿到设备信息");
             
             KWeakSelf
-            [[connectDeviceManager shareInstance] getThridMsgBySN:sn didNetEnd:^(bool didSuc) {
+            [[connectDeviceManager shareInstance] getThridMsgBySN:sn needReconnect:YES didNetEnd:^(bool didSuc) {
                 if(didSuc){
                     
                 }

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

@@ -401,7 +401,7 @@
         NSString *SNStr = deviceDict[@"Const_Have_Add_Device_SN"];
         
         if(SNStr){
-            [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr didNetEnd:^(bool didSuc) {
+            [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:NO  didNetEnd:^(bool didSuc) {
                 
                 if(didSuc){
                     NSString *curPwd = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.password;

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

@@ -275,7 +275,7 @@ bool isDownType22 = YES;
 //            }
             
             [self showNewIndicatorHaveStrWithCanBack:NO canTouch:NO showText:NSLocalizedString(@"guide_qrcoede_tips_ok",nil)];
-            [[connectDeviceManager shareInstance] getThridMsgBySN:resStr didNetEnd:^(bool didSuc) {
+            [[connectDeviceManager shareInstance] getThridMsgBySN:resStr needReconnect:YES didNetEnd:^(bool didSuc) {
                 
                 [self removeNewIndicatorHaveStr];
                 

创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -67,7 +67,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    //[self->glkshowImageView display];
+    [self->glkshowImageView display];
 }
 
 - (void)showIMage

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

@@ -34,8 +34,8 @@ typedef void (^netWork_DidEndByOK) (bool didSuc);
 
 @property(nonatomic,copy) NSString*  tcpPortStr;
 
-#pragma mark 根据扫码的sn获取第三方信息
--(void)getThridMsgBySN:(NSString*)snStr didNetEnd:(netWork_DidEndByOK)didNetEndIsOK;
+#pragma mark 根据扫码的sn获取第三方信息 是否需要重连
+-(void)getThridMsgBySN:(NSString*)snStr needReconnect:(BOOL)needReconnect didNetEnd:(netWork_DidEndByOK)didNetEndIsOK;
 
 #pragma mark 保持卡密码
 -(void)updateCardInfoBySN:(NSString*)snStr withPwdStr:(NSString*)pwd didNetEnd:(netWork_DidEndByOK)didNetEndIsOK;

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

@@ -55,9 +55,11 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 
 
 #pragma mark 根据扫码的sn获取第三方信息
--(void)getThridMsgBySN:(NSString*)snStr didNetEnd:(netWork_DidEndByOK)didNetEndIsOK
+-(void)getThridMsgBySN:(NSString*)snStr needReconnect:(BOOL)needReconnect didNetEnd:(netWork_DidEndByOK)didNetEndIsOK
 {
-    _curConnectDeviceState = DeviceConnectGetThridMsging;
+    if(needReconnect){
+        _curConnectDeviceState = DeviceConnectGetThridMsging;
+    }
     
     NSMutableDictionary *paraDict = [NSMutableDictionary new];
     [paraDict setValue:snStr forKey:@"sn"];
@@ -74,7 +76,6 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
         if(weakSelf.DeviceThirdIdMod.status == 0
            && weakSelf.DeviceThirdIdMod.data)
         {
-            weakSelf.curConnectDeviceState = DeviceConnectGetThridOK;
             
             NSString*desPwdstr = [RSATool AES128Decrypt:weakSelf.DeviceThirdIdMod.data.password key:AESCODEKEEYY];
             
@@ -86,10 +87,15 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
             [dict setObject:desPwdstr forKey:Const_Have_Add_Device_PWD];
             [HWDataManager setObjectWithKey:Const_Have_Add_Device value:dict];
             
+            //
+            bool connected = [RaylinkProxy.sharedManager isSdnConnected];
+            if(!connected || needReconnect){
+                weakSelf.curConnectDeviceState = DeviceConnectGetThridOK;
+                NSString *ipStr = weakSelf.DeviceThirdIdMod.data.ip;
+                [weakSelf startPingDeviceIp:ipStr];
+                [weakSelf initRuiyunSDKFun];
+            }
             
-            NSString *ipStr = weakSelf.DeviceThirdIdMod.data.ip;
-            [weakSelf startPingDeviceIp:ipStr];
-            [weakSelf initRuiyunSDKFun];
         }
         else{
             didNetEndIsOK(NO);