1.新增历史记录相关页面及功能 2.修改配网为热点配网 3.设备列表增加过滤门锁功能 4.增加添加设备通知功能

chenqiyang

2023-03-23 3698c13aba988cd3e41b91b255e1c682c057e565

 EZSDK/EZSDK/EZ/UIViewControllers/EZAPWiFiConfigViewController.m

@@ -139,17 +139,55 @@
                                password:self.password
                            deviceSerial:[GlobalKit shareKit].deviceSerialNo
                              verifyCode:[GlobalKit shareKit].deviceVerifyCode
                                  result:^(BOOL ret) {
                                      if (ret)
                                      {
                                          [self configSuccess];
                                      }
                                      else
                                      {
                                          [self configFailed];
                                          NSLog(@"config failed");
                                      }
                                  }];
                            deviceStatus:^(EZWifiConfigStatus status, NSString * _Nonnull deviceSerial) {
//        EZStrong(self);
        switch (status) {
            case DEVICE_WIFI_SENT_SUCCESS:// 向设备发送WiFi信息成功
                // 等待设备配网，如果wifi密码错误，最后会回调DEVICE_PLATFORM_REGIST_FAILED
                NSLog(@"向设备发送WiFi信息成功");
                [self configSuccess];

//                [EZToast show:@"向设备发送WiFi信息成功"];
                break;
            case DEVICE_WIFI_SENT_FAILED:// 向设备发送WiFi信息失败
                // 配网失败，可以重试
                NSLog(@"配网失败，请稍后重试");
//                [EZToast show:@"配网失败，请稍后重试"];
                break;
            case DEVICE_PLATFORM_REGISTED:// 设备注册平台成功
                // TODO 将设备添加到自己账号下
                NSLog(@"设备注册平台成功");
//                [EZToast show:@"设备注册平台成功"];
                
//                [self stopAction];
//                self.addBtn.hidden = NO;
                break;
            case DEVICE_PLATFORM_REGIST_FAILED:// 设备注册平台失败
                // TODO 可以自行开启新一轮轮询
                NSLog(@"设备注册平台失败");
//                [EZToast show:@"设备注册平台失败"];
                [self stopAction];
                
                break;
            default:
                break;
        }
    }];
//    [EZOPENSDK startAPConfigWifiWithSsid:self.ssid
//                                password:self.password
//                            deviceSerial:[GlobalKit shareKit].deviceSerialNo
//                              verifyCode:[GlobalKit shareKit].deviceVerifyCode
//                                  result:^(BOOL ret) {
//                                      if (ret)
//                                      {
//                                          [self configSuccess];
//                                      }
//                                      else
//                                      {
//                                          [self configFailed];
//                                          NSLog(@"config failed");
//                                      }
//                                  }];
}

- (void) stopConfigWifi
@@ -244,8 +282,13 @@
{
    NSString *ssid = [self currentSsid];
    
    if (ssid && [ssid isEqualToString:self.devicWifiName])
    {
//    if (ssid && [ssid isEqualToString:self.devicWifiName])
//    {
//        return YES;
//    }
    
    //2021-10-19 判断条件，改为只匹配后面序列号字段
    if(ssid && [ssid hasSuffix:[GlobalKit shareKit].deviceSerialNo]){//字符串末尾有序列号字符
        return YES;
    }