1.恢复出厂设置处理

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

@@ -187,7 +187,7 @@
                     [weakSelf didClickRestartFun];
                 }
                 else if (tag == 11){//恢复出厂
-                    [weakSelf RestoreFactoryingFun];
+                    [weakSelf RestoreFactoryAleartFun];
                 }
             };
         }
@@ -293,7 +293,6 @@
 - (void)gotoResetFun
 {
     [[webSocketManager shareInstance] needToResetFun];
-    
     [self RestoreFactoryingFun];
 }
 
@@ -332,7 +331,9 @@
     if(snStr){
         [[connectDeviceManager shareInstance] getThridMsgBySN:snStr needReconnect:YES didNetEnd:^(NSInteger didSuc) {
             if(didSuc){
-        
+//                if(self->_needToResetAndOk){
+//                    self->_needToResetAndOk();
+//                }
             }
             else{
                 [weakSelf RestoreFactoryCompleteFun];
@@ -344,7 +345,7 @@
     
     /*弹窗提示恢复出厂*/
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factory_ok_tips",nil)
-                                                                                     msg:@""//NSLocalizedString(@"my_set_no_Restore_Factory_ok_msg",nil)
+                                                                                     msg:NSLocalizedString(@"my_set_no_Restore_Factory_ok_msg",nil)
                                                                                 imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"my_set_no_Restore_FactoryOK",nil)
                                                                                  okTitle:nil
@@ -352,7 +353,7 @@
                                                                               didClickOk:^{
         
     } didClickCancel:^{
-        
+        [weakSelf.navigationController popViewControllerAnimated:YES];
     }];