temp

2018-08-27 21:34:34 +08:00
parent eb993bbe01
commit ee03c2b4c8
4 changed files with 87 additions and 72 deletions
@@ -20,6 +20,10 @@
@property (nonatomic, strong) MBProgressHUD *HUD;
@property (nonatomic, assign) BOOL isDeleteingDevice;

+@property (nonatomic, strong) NSTimer *deleteTimer;
+
+@property (nonatomic, assign) NSInteger retryTimes;
+
@end

@implementation SettingResetViewController
@@ -37,29 +41,32 @@
    }
    [IFishHotpotUDPHelper sharedInstance].delegate = self;
    [[IFishHotpotUDPHelper sharedInstance] broadCastRestCommand];
-    
-    __weak typeof(self) weakSelf = self;
-    [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        BOOL networkOk = NO;
-        if (status == AFNetworkReachabilityStatusReachableViaWiFi) {
-            if (![[strongSelf currentWifiSSID].lowercaseString hasPrefix:@"ifish"]) {
-                networkOk = YES;
-            }
-        } else if (status == AFNetworkReachabilityStatusReachableViaWWAN) {
+}
+
+- (void)deleteNow {
+    BOOL networkOk = NO;
+    AFNetworkReachabilityStatus status = [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus;
+    if (status == AFNetworkReachabilityStatusReachableViaWiFi) {
+        if (![[self currentWifiSSID].lowercaseString hasPrefix:@"ifish"]) {
            networkOk = YES;
        }
-        if (!networkOk) {
-            return;
-        }
-        if (strongSelf.isDeleteingDevice) {
-            return;
-        }
-        strongSelf.isDeleteingDevice = YES;
-        [strongSelf deletDevice];
-    }];
-    [[AFNetworkReachabilityManager sharedManager] startMonitoring];
+    } else if (status == AFNetworkReachabilityStatusReachableViaWWAN) {
+        networkOk = YES;
+    }
+    if (!networkOk) {
+        return;
+    }
+    if (self.isDeleteingDevice) {
+        return;
+    }
+    if (self.deleteTimer) {
+        [self.deleteTimer invalidate];
+        self.deleteTimer = nil;
+    }
+    self.isDeleteingDevice = YES;
+    [self deletDevice];
 }
+
 - (IBAction)tipBtnClicked:(id)sender {
    ConnectHotspotTipViewController *vc = [[ConnectHotspotTipViewController alloc] initWithNibName:nil bundle:nil];
    [self.navigationController pushViewController:vc animated:YES];
@@ -73,6 +80,7 @@
    [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;
        }
    }];
@@ -112,6 +120,7 @@
            [[DataCenter defaultDtacenter] setValue:guanxiiArr forKey:@"devicamerArr"];
        }
    }
+    self.retryTimes = 0;
    [self deleteDeviceRequset];
 }

@@ -155,8 +164,13 @@
        }
        
    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-        self.HUD.labelText = @"请求异常";
-        [self.HUD hide:YES afterDelay:2];
+        if (self.retryTimes < 3) {
+            [self deleteDeviceRequset];
+            self.retryTimes += 1;
+        } else {
+            self.HUD.labelText = @"请求异常";
+            [self.HUD hide:YES afterDelay:2];
+        }
    }];
 }