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

连接界面修改

Browse Source 
修改连接摄像头连接方式选择界面
This commit is contained in:
kai
2019-11-03 21:39:23 +08:00
parent b2ad110ed2
commit 9c0d42d796
13 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
+20 -4
View File
@@ -131,10 +131,18 @@ extern BOOL isfromCameraView;
return;
}
if ( [GWP2PClient sharedClient].linkStatus==P2PLinkStatusOK) {
self.hidesBottomBarWhenPushed = YES;
YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init];
[self.navigationController pushViewController:nextvc animated:YES];
nextvc.conectType = 0;
ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
methodVC.deviceType=DEVICECAMERA;
methodVC.titleString=@"连接摄像头";
[self.navigationController pushViewController:methodVC animated:YES];
// self.hidesBottomBarWhenPushed = YES;
// YooseeNextConnectViewController *nextvc=[[YooseeNextConnectViewController alloc] init];
// [self.navigationController pushViewController:nextvc animated:YES];
// nextvc.conectType = 0;
}else{
UserModel *model=[dataContorl getUserInfo];
@@ -156,21 +164,29 @@ extern BOOL isfromCameraView;
}
self.hidesBottomBarWhenPushed = YES;
ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
methodVC.deviceType=DEVICEAQUARIUM;
// SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
// wifivc.vcTitle=@"连接水族箱";
methodVC.titleString=@"连接水族箱";
[self.navigationController pushViewController:methodVC animated:YES];
}
break;
case 2:
{
self.hidesBottomBarWhenPushed = YES;
// ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
// methodVC.deviceType=DEVICEHEATING;
// methodVC.titleString=@"连接加热器";
//
// [self.navigationController pushViewController:methodVC animated:YES];
SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
wifivc.vcTitle=@"连接加热器";
[self.navigationController pushViewController:wifivc animated:YES];
// [wifivc addTitleViewWithTitle:@"连接加热器"];
[wifivc addTitleViewWithTitle:@"连接加热器"];
//[self.view makeToast:@"敬请期待"]; 加热棒