From 664f1024f21ffb729bd196861789d634dc330c9c Mon Sep 17 00:00:00 2001 From: xuemh Date: Fri, 11 May 2018 15:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RuiMei/RuiMeiBackMsgUtils.m | 9 ++++----- .../RuiMei/RuiMeiCHNameCustom.m | 4 ++-- .../RuiMei/RuiMeiInputViewController.m | 6 +++--- .../RuiMei/RuiMeiSetViewController.m | 8 +++++++- .../RuiMei/RuiMeiViewController.m | 16 +++++++++++++--- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m index 14d57c4..0728b27 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m @@ -134,15 +134,14 @@ float TPlabel=mac/10; int temp= (int)(TPlabel+0.5); NSString *stringFloat = [NSString stringWithFormat:@"%d",temp]; - [jiaReBang setImage:nil forState:UIControlStateNormal]; - + UILabel *lbl = [jiaReBang viewWithTag:1]; if ([stateString6 isEqualToString:@"01"]){ //加热 - [jiaReBang setTitleColor:JWUIColorFromRGB(0x38b9fc) forState:UIControlStateNormal]; + lbl.textColor = JWUIColorFromRGB(0x38b9fc); }else{ - [jiaReBang setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal]; + lbl.textColor = [UIColor lightGrayColor]; } - [jiaReBang setTitle:stringFloat forState:UIControlStateNormal]; + lbl.text = [NSString stringWithFormat:@"%@°C", stringFloat]; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiCHNameCustom.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiCHNameCustom.m index 882303e..9de64ae 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiCHNameCustom.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiCHNameCustom.m @@ -23,8 +23,8 @@ RuiMeiCHControl *runsunCH = [UserExtendataArchaver unArchiverRuiMeiDeviceCHInfo:macaddress]; if (!runsunCH||[runsunCH isKindOfClass:[NSNull class]]) { runsunCH = [[RuiMeiCHControl alloc] init]; - runsunCH.ch1name = @"S1"; - runsunCH.ch2name = @"S2"; + runsunCH.ch1name = @"灯1"; + runsunCH.ch2name = @"灯2"; runsunCH.ch3name = @"UV/杀菌"; runsunCH.ch4name = @"冲浪/氧泵"; runsunCH.jiaRe = @"加热棒"; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiInputViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiInputViewController.m index c5eb32f..655b302 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiInputViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiInputViewController.m @@ -62,7 +62,7 @@ cell.lineImgView.image = [UIImage imageNamed:@"redact_line_last"]; } - NSArray *titles= @[@"S1",@"S2",@"UV/杀菌",@"冲浪/氧泵",@"加热棒"]; + NSArray *titles= @[@"灯1",@"灯2",@"UV/杀菌",@"冲浪/氧泵",@"加热棒"]; if (indexPath.section==1) { cell.chTitle.text = titles[indexPath.row]; } @@ -93,11 +93,11 @@ RuiMeiCHControl *ruSunch = [[RuiMeiCHControl alloc] init]; RuSunChangeNameTextViewCell*cell1 = [self.view viewWithTag:RUSUNCHCELL_CH1]; if (cell1.chName.text.length>3) { - [self.view makeToast:@"S1不能超过3个字"]; + [self.view makeToast:@"灯1不能超过3个字"]; return; } if (cell1.chName.text.length==0) { - [self.view makeToast:@"S1不能为空"]; + [self.view makeToast:@"灯1不能为空"]; return; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiSetViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiSetViewController.m index 6415ad6..8f1822a 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiSetViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiSetViewController.m @@ -470,6 +470,10 @@ -(void)btnCliCk:(UIButton*)btn{ + if (self.customModeOn) { + return; + } + TimerSateModel*stateModel=[[TimerSateModel alloc]init]; stateModel.sendmacId = self.currentdevice.macAddress; stateModel.resavemacId =self.currentdevice.macAddress; @@ -771,7 +775,9 @@ }else if (indexPath.section!=0){ - + if (self.customModeOn) { + return; + } _mydatepicView=[[MydatePickerView alloc]init]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m index 8772fd3..26692dd 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m @@ -133,7 +133,7 @@ //textLbl.backgroundColor = [UIColor blackColor]; self.chName.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1]; self.chName.textAlignment = NSTextAlignmentCenter; - NSArray *arr = @[@"S1",@"S2",@"UV/杀菌"]; + NSArray *arr = @[@"灯1",@"灯2",@"UV/杀菌"]; self.chName.text = arr[i]; self.chName.font = [UIFont boldSystemFontOfSize:14]; @@ -165,11 +165,21 @@ self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -25 -5 , btnControlWith, btnControlWith + 11); - [self.button setBackgroundImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal]; + [self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal]; self.button.tag= 6003+i; [self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside]; - + if (i == 1) { + UILabel *tempLbl = [UILabel new]; + [self.button addSubview:tempLbl]; + tempLbl.tag = 1; + tempLbl.font = [UIFont boldSystemFontOfSize:14]; + tempLbl.textColor = [UIColor lightGrayColor]; + tempLbl.textAlignment = NSTextAlignmentCenter; + tempLbl.translatesAutoresizingMaskIntoConstraints = NO; + [NSLayoutConstraint constraintWithItem:tempLbl attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self.button attribute:NSLayoutAttributeCenterX multiplier:1.0 constant:0.0].active = YES; + [NSLayoutConstraint constraintWithItem:tempLbl attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:self.button attribute:NSLayoutAttributeCenterY multiplier:1.0 constant:-4.0].active = YES; + } UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith, btnControlWith, btnControlPlace - 5)]; //textLbl.backgroundColor = [UIColor blackColor]; textLbl.textAlignment = NSTextAlignmentCenter;