技威sdk更新和热点链接加强

2020-06-06 18:31:34 +08:00
parent ee657760c4
commit 2118422cba
36 changed files with 353 additions and 52 deletions
@@ -124,7 +124,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
        [self.view makeToast:@"请先连接设备热点"];
        return;
    }
-    if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound||[wifiName isEqualToString:@"WLAN"]) {
+    if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound||[wifiName.lowercaseString isEqualToString:@"wlan"]||![wifiName isEqualToString:self.wifiName]) {
        //wifi正确，则尝试连接设备
        if(self.deviceType==DEVICECAMERA)
        {
@@ -1380,7 +1380,13 @@ Assign BOOL isPush;
        
    [self delectTankWith:deviceListModel AtIndexPath:indexPath];
        
-    }else{
+    }
+   else if ([deviceListModel.type isEqualToString:@"pets"]) {
+        
+    [self delectTankWith:deviceListModel AtIndexPath:indexPath];
+        
+    }
+    else{
        //camera
        
        
@@ -1490,14 +1496,34 @@ Assign BOOL isPush;
    mannager.responseSerializer=[AFHTTPResponseSerializer serializer];
    NSMutableDictionary * para = [NSMutableDictionary dictionary];
    
-    NSString *priId=deviceListModel.device.deviceId;
-    ;
-    NSString*userId=deviceListModel.device.userId;
+    NSString*string=[NSString stringWithFormat:@"%@/api/user/deleteDeviceUser.do",JIEKOUPORT];
+    
+
+    if ([deviceListModel.type isEqualToString:@"pets"]) {
+        string=[NSString stringWithFormat:@"%@/api/user/deletePetDeviceUser.do",JIEKOUPORT];
+        DeviceModel*model=[deviceListModel.list firstObject];
+        NSString *priId=model.deviceId;
+        ;
+        NSString*userId=model.userId;
+        para[@"userId"]=userId;
+        para[@"deviceId"]=priId;
+
+        
+        
+    }
+    else
+    {
+        NSString *priId=deviceListModel.device.deviceId;
+        ;
+        NSString*userId=deviceListModel.device.userId;
+        
+        [para setValue:priId forKey:@"priId.deviceId"];
+        [para setValue:userId forKey:@"priId.userId"];
+    }
    
-    [para setValue:priId forKey:@"priId.deviceId"];
-    [para setValue:userId forKey:@"priId.userId"];
      __weak typeof (self)weakSelf=self;
-    [mannager POST:kDeleteDeviceUser parameters:para success:^(AFHTTPRequestOperation *operation, id responseObject) {
+    
+    [mannager POST:string parameters:para success:^(AFHTTPRequestOperation *operation, id responseObject) {
        if (responseObject) {
            NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
           
@@ -1543,9 +1569,10 @@ Assign BOOL isPush;
                    [weakSelf.tableView reloadData];

                });
+                [weakSelf addDataRequestQueue];
                
                /* 
-                 而如果有循环的调用的话，可以用dispatch_source_set_timer来实现 用到GCD的事件源和事件监听的机制
+                 而如果有循环的调用的话，可以用dispatch_source_set_timer来实现  用到GCD的事件源和事件监听的机制
                 int interval = 2;
                 int leeway = 0;
                 
@@ -568,6 +568,19 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像
 }
 //智能联机
 -(void)smartLinkConnect{
+    
+    
+    //拿到AVAudioSession的单例对象
+    AVAudioSession *audioSession = [AVAudioSession sharedInstance];
+
+    //设置为听筒模式
+    //[audioSession overrideOutputAudioPort:AVAudioSessionPortOverrideNone error:nil];
+      
+    //设置为公放模式
+    [audioSession overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:nil];
+
+     //让我的App占用听筒或扬声器
+     [audioSession setActive:YES error:nil];
    WEAK_SELF;
    [[GWP2PDeviceLinker shareInstance] p2pStopSmartLink];
    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(100 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{