diff --git a/Ifish/Info.plist b/Ifish/Info.plist index aa3d9cc..70502d6 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 509 + 510 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m index ca61e48..907548a 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.m @@ -75,21 +75,21 @@ #pragma mark - IFishHotpotUDPHelperDelegate - (void)udpHelperCommandExecutedSuccess:(IFishUDPHelperBackMsgModel *)backModel { - self.HUD.labelText = @"设备正在恢复出厂设置"; - NSArray*deviceArry=[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"]; - [deviceArry enumerateObjectsUsingBlock:^(DeviceModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.macAddress isEqualToString:backModel.senderMacAddress]) { - self.currentDevice = obj; - self.deleteTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(deleteNow) userInfo:nil repeats:YES]; - *stop = YES; - } - }]; + [self.view makeToast:@"设备已重置"]; + [self.navigationController popViewControllerAnimated:YES]; +// self.HUD.labelText = @"设备正在恢复出厂设置"; +// NSArray*deviceArry=[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"]; +// [deviceArry enumerateObjectsUsingBlock:^(DeviceModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { +// if ([obj.macAddress isEqualToString:backModel.senderMacAddress]) { +// self.currentDevice = obj; +// self.deleteTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(deleteNow) userInfo:nil repeats:YES]; +// *stop = YES; +// } +// }]; } - (void)udpHelperMessage:(NSString *)msg { - self.HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; - self.HUD.mode = MBProgressHUDModeIndeterminate; - self.HUD.labelText = msg; +// [self.view makeToast:msg]; } #pragma mark - 删除设备