root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

摄像头增加AP配网模式，bug修改，bugly id修改

Browse Source 
摄像头增加AP配网模式，bug修改，bugly id修改
其他页面修改，细节处理
This commit is contained in:
kai
2019-11-07 22:29:04 +08:00
parent 9c0d42d796
commit 3da5a875ec
13 changed files with 225 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m
+27 -7
View File
@@ -68,7 +68,15 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
}
-(void)addContentLabel{
UILabel *preLabel;
NSArray *textArr = @[@"1.请将产品15秒内断电通电3次进入热点模式；",@"2.点击去设置：设置-WiFi-选择ifish-xxx的网络，输入密码12345678，连接好后返回爱奇鱼app。"];
NSString*tip1=@"1.请将产品重置后15秒内断电通电3次进入热点模式；";
NSString*tip2=@"2.点击去设置：设置-WiFi-选择ifish-xxx的网络，输入密码12345678，连接好后返回爱奇鱼app。";
if (self.deviceType==DEVICECAMERA)
{
tip2=@"2.点击去设置：设置-WiFi-选择GW-AP-xxx的网络，一般无密码或12345678或查看说明书，连接好后返回爱奇鱼app。";
}
NSArray*textArr=@[tip1,tip2];
for (int i=0; i<2; i++) {
UILabel *label = InitObject(UILabel);
label.text = textArr[i];
@@ -113,12 +121,24 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
}
if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound) {
//wifi正确，则尝试连接设备
ConnectingAquarVC *connecting = InitObject(ConnectingAquarVC);
connecting.ssid = self.ssid;
connecting.bssid = self.bssid;
connecting.wifiName = self.wifiName;
connecting.wifiPassword = self.wifiPwd;
[self.navigationController pushViewController:connecting animated:YES];
if(self.deviceType==DEVICECAMERA)
{
YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init];
nextvc.wifiName=self.wifiName;
nextvc.wifiPwd=self.wifiPwd;
nextvc.conectType =conectType_ap;
[self.navigationController pushViewController:nextvc animated:YES];
}
else
{
ConnectingAquarVC *connecting = InitObject(ConnectingAquarVC);
connecting.ssid = self.ssid;
connecting.bssid = self.bssid;
connecting.wifiName = self.wifiName;
connecting.wifiPassword = self.wifiPwd;
[self.navigationController pushViewController:connecting animated:YES];
}
}else{
[self.view makeToast:@"WiFi名称不匹配，请重试"];
}