|
|
@@ -250,8 +250,8 @@
|
|
|
KWeakSelf
|
|
|
/*弹窗提示重启*/
|
|
|
ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_restart_phone_tips",nil)
|
|
|
- msg:nil
|
|
|
- imageStr:nil
|
|
|
+ msg:@""
|
|
|
+ imageStr:@""
|
|
|
cancelTitle:NSLocalizedString(@"other_cancel",nil)
|
|
|
okTitle:NSLocalizedString(@"my_set_no_restart_phone_btn_ok",nil) isOkBtnHighlight:NO
|
|
|
didClickOk:^{
|
|
|
@@ -337,25 +337,11 @@
|
|
|
{
|
|
|
KWeakSelf
|
|
|
//瑞云发起重连
|
|
|
- NSString *snStr = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.changeSn;
|
|
|
- if(snStr){
|
|
|
- [[connectDeviceManager shareInstance] getThridMsgBySN:snStr needReconnect:YES didNetEnd:^(NSInteger didSuc) {
|
|
|
- if(didSuc){
|
|
|
-// if(self->_needToResetAndOk){
|
|
|
-// self->_needToResetAndOk();
|
|
|
-// }
|
|
|
- }
|
|
|
- else{
|
|
|
- [weakSelf RestoreFactoryCompleteFun];
|
|
|
- return;
|
|
|
- }
|
|
|
- }];
|
|
|
- }
|
|
|
-
|
|
|
+ //[[connectDeviceManager shareInstance] onConnectFun];
|
|
|
|
|
|
/*弹窗提示恢复出厂*/
|
|
|
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:@""
|
|
|
imageStr:nil
|
|
|
cancelTitle:NSLocalizedString(@"my_set_no_Restore_FactoryOK",nil)
|
|
|
okTitle:nil
|
|
|
@@ -363,7 +349,7 @@
|
|
|
didClickOk:^{
|
|
|
|
|
|
} didClickCancel:^{
|
|
|
- [weakSelf.navigationController popViewControllerAnimated:YES];
|
|
|
+
|
|
|
}];
|
|
|
|
|
|
|