宠物店修改

Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m

@@ -124,7 +124,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
         [self.view makeToast:@"请先连接设备热点"];
         return;
     }
-    if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound) {
+    if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound||[wifiName isEqualToString:@"WLAN"]) {
         //wifi正确，则尝试连接设备
         if(self.deviceType==DEVICECAMERA)
         {
@@ -141,6 +141,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
             connecting.bssid = self.bssid;
             connecting.wifiName = self.wifiName;
             connecting.wifiPassword = self.wifiPwd;
+            connecting.deviceType=self.deviceType;
             [self.navigationController pushViewController:connecting animated:YES];
         }