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

UI调整

This commit is contained in:
祝发冬 2022-07-26 19:29:59 +08:00
parent 32bd4f90fb
commit bfea224e9e
6 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ifish.xcodeproj/project.pbxproj
View File

@ -16025,7 +16025,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;
@ -16144,7 +16144,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES;

10
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSelectHeader.xib
View File

@ -17,6 +17,13 @@
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ifishSetCell_back.png" translatesAutoresizingMaskIntoConstraints="NO" id="Y79-yA-YK5">
<rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NKJ-6P-7Z5" userLabel="lineView">
<rect key="frame" x="5" y="0.0" width="365" height="0.5"/>
<color key="backgroundColor" red="0.25490196079999999" green="0.25490196079999999" blue="0.25490196079999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="3fu-hI-Pyh"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="杀菌灯" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="15T-Hk-end">
<rect key="frame" x="52" y="11" width="46" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
@ -53,6 +60,9 @@
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="NKJ-6P-7Z5" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="0qo-Uf-ATW"/>
<constraint firstAttribute="trailing" secondItem="NKJ-6P-7Z5" secondAttribute="trailing" constant="5" id="K96-tG-eUR"/>
<constraint firstItem="NKJ-6P-7Z5" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="5" id="QSr-q4-uRo"/>
<constraint firstItem="Y79-yA-YK5" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="Xed-ko-MEG"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="AWf-ci-ZDG" secondAttribute="trailing" constant="35" id="Y5h-qw-cMO"/>
<constraint firstItem="Y79-yA-YK5" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" id="gST-eX-J7c"/>

19
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.m
View File

@ -215,20 +215,21 @@ static NSString *setTimerflag = @"SetTimerCell";
}else if(indexPath.section == 1 && indexPath.row == 0){
if (![self.currentdevice.waterRemind isEqual:[NSNull null]]) {
ChangeWaterCell *cell = [tableView dequeueReusableCellWithIdentifier:changeWaterCellid];
[cell.ChangeWaterSwitch addTarget:self action:@selector(xuTochangeWaterSwitch:) forControlEvents:UIControlEventTouchUpInside];
if ([self.waterInfmodel.waterremind isEqualToString:@"1"]) {
[cell.ChangeWaterSwitch setBackgroundImage:[UIImage imageNamed:@"greenbtn_big"] forState:UIControlStateNormal];
cell.ChangeWaterSwitch.selected = NO;
cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"firstSetCell"]];
cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"centerrect"]];
_huanShuiSwitchIsOn=YES;
}else{
[cell.ChangeWaterSwitch setBackgroundImage:[UIImage imageNamed:@"graybtn_big"] forState:UIControlStateNormal];
cell.ChangeWaterSwitch.selected = YES;
_huanShuiSwitchIsOn=NO;
cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"set_cellBack"]];
cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bottomRound"]];
}
if (self.waterInfmodel.remindcycle == 0) {
//在未获取换水信息时暂时显示
cell.huanshuiDaylabel.text=@"换水时间";
@ -399,7 +400,17 @@ static NSString *setTimerflag = @"SetTimerCell";
return oneHeader;
}else if(section > 1){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"centerrect"];
if (section==2)
{
headerView.backImageView.image=[UIImage imageNamed:@"topround"];
}
if (section==1+_titieArr.count)
{
headerView.backImageView.image=[UIImage imageNamed:@"bottomRound"];
}
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;

12
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerListViewController.m
View File

@ -466,7 +466,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
return oneHeader;
}else if(section == 2){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"centerrect"];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;
@ -476,7 +476,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
return headerView;
}else if(section == 3){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"centerrect"];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;
@ -486,7 +486,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
return headerView;
}else if(section == 4){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"centerrect"];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;
@ -504,7 +504,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
else
{
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"centerrect"];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;
@ -516,7 +516,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
}else if(section == 6){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"centerrect"];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;
@ -526,7 +526,7 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
return headerView;
}else if(section == 7){
XuanduoSelectHeader *headerView = [XuanduoSelectHeader shareHeaderView];
headerView.backImageView.image=[UIImage imageNamed:@"set_cellBack"];
headerView.backImageView.image=[UIImage imageNamed:@"bottomRound"];
headerView.controlBtn.tag = kBtnTag + section;
if (_selectSection == section) {
headerView.controlBtn.selected = YES;

10
Ifish/views/setViewCell/ChangeWaterCell.xib
View File

@ -22,6 +22,13 @@
<color key="textColor" red="0.1215686275" green="0.1215686275" blue="0.1215686275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Clw-cb-vbP" userLabel="lineView">
<rect key="frame" x="5" y="0.0" width="319" height="0.5"/>
<color key="backgroundColor" red="0.25490196079999999" green="0.25490196079999999" blue="0.25490196079999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="4wu-5a-cWx"/>
</constraints>
</view>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bPu-W6-hDN" userLabel="icon">
<rect key="frame" x="18" y="11" width="30" height="26"/>
<constraints>
@ -54,8 +61,11 @@
<constraint firstItem="bPu-W6-hDN" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="18" id="In1-QK-w7N"/>
<constraint firstItem="B34-8H-MOY" firstAttribute="leading" secondItem="Mjj-aG-rUn" secondAttribute="trailing" constant="41" id="aXj-ot-8vV"/>
<constraint firstAttribute="trailingMargin" secondItem="hLN-Fh-Sqa" secondAttribute="trailing" constant="5" id="dd0-Ro-5Sl"/>
<constraint firstItem="Clw-cb-vbP" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="5" id="heT-cx-6JA"/>
<constraint firstItem="hLN-Fh-Sqa" firstAttribute="leading" secondItem="B34-8H-MOY" secondAttribute="trailing" constant="20" id="o6f-MO-pkf"/>
<constraint firstItem="Clw-cb-vbP" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="p3p-JV-2Mg"/>
<constraint firstItem="B34-8H-MOY" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="sA8-Aj-W2A"/>
<constraint firstAttribute="trailing" secondItem="Clw-cb-vbP" secondAttribute="trailing" constant="5" id="vdj-tB-FWu"/>
<constraint firstItem="Mjj-aG-rUn" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="10" id="wcw-Bh-YPu"/>
</constraints>
</tableViewCellContentView>

2
Ifish/views/setViewCell/TemperatureSetCell.m
View File

@ -18,7 +18,7 @@
clearView.frame=self.bounds;
[self setSelectedBackgroundView:clearView];
self.backgroundView=[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"set_cellBack"]];
self.backgroundView=[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"topround"]];
//可用下面替换
// self.selectionStyle = UITableViewCellSelectionStyleNone;