Merge commit 'e504e436d566a02ac45f35e639510ee1f232f88e' into HiBoxde1.0

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

@@ -248,13 +248,19 @@
                 //有设备了先去做链接准备  // 80bec9c5
                 NSString *SNStr = deviceDict[@"Const_Have_Add_Device_SN"];
                 if(SNStr){
+                    KWeakSelf
                     [[connectDeviceManager shareInstance] updateCardInfoBySN:SNStr withPwdStr:pwd didNetEnd:^(bool didSuc) {
                         
+                        if(didSuc){
+                            [weakSelf getPwdFunBy:SNStr];
+                        }
+                        else{
+                            [[iToast makeText:NSLocalizedString(@"log_login_system_busy",nil)] show];
+                        }
                     }];
                 }
             }
             
-            [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
             
         }else{
             /*提示密码不一致*/
@@ -294,6 +300,21 @@
     }
 }
 
+#pragma mark 重新获取密码
+-(void)getPwdFunBy:(NSString*)SNStr
+{
+    [[connectDeviceManager shareInstance] getThridMsgBySN:SNStr needReconnect:NO  didNetEnd:^(bool didSuc) {
+        
+        if(didSuc){
+            [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
+        }
+        else{
+            [[iToast makeText:NSLocalizedString(@"log_login_system_busy",nil)] show];
+        }
+        
+    }];
+}
+
 /*
 #pragma mark - Navigation