宠物笼和蛋分器文本修改

2022-12-10 17:29:16 +08:00
parent 53c926d2dd
commit e0a19c275c
3 changed files with 18 additions and 4 deletions
@@ -279,7 +279,7 @@ Copy NSString *deviceId;
        }
        else
        {
-            if (self.isBindingDevice) {
+            if (self.isBindingDevice||self.storeNameView) {
                return;
            }
            if (self.macAddress.length == 0) {
@@ -357,6 +357,7 @@ Copy NSString *deviceId;
 {
    [self.storeNameView removeFromSuperview];
    [self.mask removeFromSuperview];
+    self.storeNameView =nil;
    [self.progressView endProgressWithString:@"绑定已经取消..."];
   
 }
@@ -364,14 +365,20 @@ Copy NSString *deviceId;
 {
    [self.HUD hide:YES];
    [self.storeNameView removeFromSuperview];
+    if (self.bindTimer) {
+        [self.bindTimer invalidate];
+        self.bindTimer = nil;
+    }
    StoreNameView*store=[[[NSBundle mainBundle] loadNibNamed:@"StoreNameView" owner:self options:nil] lastObject];
    store.frame=CGRectMake((SCREEN_WIDTH-280)/2.0, 100, 280, 280);
    
    self.storeNameView=store;
+    
    WEAK_SELF;
    store.cancelBlock=^(){
        [weakSelf.mask removeFromSuperview];
         [weakSelf.storeNameView removeFromSuperview];
+        weakSelf.storeNameView =nil;
        [weakSelf.HUD show:YES];
        [weakSelf.progressView endProgressWithString:@"绑定已经取消..."];
        
@@ -385,6 +392,7 @@ Copy NSString *deviceId;
        }
        [weakSelf.mask removeFromSuperview];
         [weakSelf.storeNameView removeFromSuperview];
+        weakSelf.storeNameView =nil;
        weakSelf.storeName=name;
        [self bindDeviceWithSsid:self.macAddress];
         [weakSelf.HUD show:YES];