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

宠物店修改

Browse Source
This commit is contained in:
kai60
2020-05-02 14:56:49 +08:00
parent 8fca79324a
commit 53f06fcf43
100 changed files with 2672 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.m
+3
View File
@@ -26,6 +26,9 @@
self.deviceImg.image = [UIImage imageNamed:@"加热系统"];
}
else if (indexPath.row ==3){
self.deviceImg.image = [UIImage imageNamed:@"智能宠物系统"];
}
else if (indexPath.row ==4){
self.deviceImg.image = [UIImage imageNamed:@"敬请期待"];
}
Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
+31 -12
View File
@@ -86,7 +86,7 @@ extern BOOL isfromCameraView;
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
return 4;
return 5;
}
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -102,7 +102,7 @@ extern BOOL isfromCameraView;
}
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
return 378/2.0;
return 278/2.0;
}
- (void)didReceiveMemoryWarning {
@@ -126,10 +126,10 @@ extern BOOL isfromCameraView;
{
//摄像头
NSArray * cameraArr =[[DataCenter defaultDtacenter]valueForKey:@"cameraArr"];
if ([cameraArr count]>=5) {
[self.view makeToast:@"设备已达上限"];
return;
}
// if ([cameraArr count]>=5) {
// [self.view makeToast:@"设备已达上限"];
// return;
// }
if ( [GWP2PClient sharedClient].linkStatus==P2PLinkStatusOK) {
@@ -156,12 +156,12 @@ extern BOOL isfromCameraView;
//水族箱
NSArray * deviceArr =[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"];
if ([deviceArr count]>=5) {
[self.view makeToast:@"设备已达上限"];
return;
}
// if ([deviceArr count]>=5) {
//
// [self.view makeToast:@"设备已达上限"];
// return;
//
// }
self.hidesBottomBarWhenPushed = YES;
ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
methodVC.deviceType=DEVICEAQUARIUM;
@@ -190,6 +190,25 @@ extern BOOL isfromCameraView;
//[self.view makeToast:@"敬请期待"]; 加热棒
}
break;
case 3:
{
self.hidesBottomBarWhenPushed = YES;
ConAquarMethodVC *methodVC = InitObject(ConAquarMethodVC);
methodVC.deviceType=DEVICEPETS;
methodVC.titleString=@"连接宠物笼";
[self.navigationController pushViewController:methodVC animated:YES];
// SecondConnectWifiController *wifivc=[[SecondConnectWifiController alloc]init];
// wifivc.vcTitle=@"连接加热器";
// [self.navigationController pushViewController:wifivc animated:YES];
// [wifivc addTitleViewWithTitle:@"连接加热器"];
//[self.view makeToast:@"敬请期待"]; 加热棒
}
break;