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

新配置界面

Browse Source
This commit is contained in:
roy
2018-09-22 21:40:37 +08:00
parent ae72c0eaeb
commit 8a43861303
59 changed files with 1428 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.m
+7 -4
View File
@@ -18,12 +18,15 @@
-(void)initCellImgsAt:(NSIndexPath *)indexPath
{
if (indexPath.row==0) {
self.deviceImg.image = [UIImage imageNamed:@"select_camera"];
self.deviceImg.image = [UIImage imageNamed:@"摄像头"];
}else if (indexPath.row==1){
self.deviceImg.image = [UIImage imageNamed:@"select_aquarium"];
}else if (indexPath.row ==2){
self.deviceImg.image = [UIImage imageNamed:@"select_waiting"];
self.deviceImg.image = [UIImage imageNamed:@"水族控制系统"];
}else if (indexPath.row==2){
self.deviceImg.image = [UIImage imageNamed:@"加热系统"];
}
else if (indexPath.row ==3){
self.deviceImg.image = [UIImage imageNamed:@"敬请期待"];
}
}
Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib
+4 -4
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -15,10 +15,10 @@
<rect key="frame" x="0.0" y="0.0" width="371" height="259"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="371" height="258"/>
<rect key="frame" x="0.0" y="0.0" width="371" height="258.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bYx-Sh-9R0">
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bYx-Sh-9R0">
<rect key="frame" x="0.0" y="0.0" width="371" height="259"/>
</imageView>
</subviews>
Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m
+10 -3
View File
@@ -12,6 +12,9 @@
#import "UDPManager.h"
#import "YooseeNextConnectViewController.h"
#import "SecondConnectWifiController.h"
#import "IfishHotBarVc.h"
@interface IfishBindDeviceSelectViewController ()<UITableViewDelegate,UITableViewDataSource>
@property (nonatomic,strong) UITableView *tableView;
@property(nonatomic)BOOL islogInGewell;
@@ -110,7 +113,7 @@ extern BOOL isfromCameraView;
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
return 3;
return 4;
}
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -127,7 +130,7 @@ extern BOOL isfromCameraView;
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
return self.view.frame.size.width*0.698;
return self.view.frame.size.width*0.504;
}
@@ -211,7 +214,11 @@ extern BOOL isfromCameraView;
break;
case 2:
{
//[self.view makeToast:@"敬请期待"];
//[self.view makeToast:@"敬请期待"]; 加热棒
IfishHotBarVc*barVc=[[IfishHotBarVc alloc]init];
barVc.hidesBottomBarWhenPushed=YES;
[self.navigationController pushViewController:barVc animated:YES];
}
break;