From c12010e06ad286b8acfbeab561ee4011e2864f02 Mon Sep 17 00:00:00 2001 From: xuemh Date: Thu, 14 Jun 2018 09:31:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E7=83=AD=E6=A3=92?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish/Info.plist | 2 +- .../SongNuoDBCenterViewController.m | 15 +++++++++++++-- .../SongNuo/SongNuoBackMsgDataUnity.m | 17 ++++++++++------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 248d18a..73d8a0a 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 478 + 479 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuo86Byte/SongNuoDBCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuo86Byte/SongNuoDBCenterViewController.m index b0ca218..fcde140 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuo86Byte/SongNuoDBCenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuo86Byte/SongNuoDBCenterViewController.m @@ -185,7 +185,7 @@ } - NSArray *nameArr=@[@"PFLight1_off",@"PFLight1_off",@"ChongLang_off",@"O2_off",@"",@"PFkilLlight_off",@"JiaReBang_off"]; + NSArray *nameArr=@[@"PFLight1_off",@"PFLight1_off",@"ChongLang_off",@"O2_off",@"",@"PFkilLlight_off",@"JiaReBang"]; CGFloat btnControlWith = 70; CGFloat btnControlPlace = (kScreenSize.width - 3*btnControlWith )/4; @@ -242,7 +242,18 @@ self.button.tag= 600003+i; [self.button addTarget:self action:@selector(songNuoBDBtnClick:) forControlEvents:UIControlEventTouchUpInside]; - + if (i == 2) { + [self.button setImage:[UIImage imageNamed:nameArr.lastObject] forState:UIControlStateNormal]; + UILabel *tempLbl = [UILabel new]; + [self.button addSubview:tempLbl]; + tempLbl.tag = 1; + tempLbl.font = [UIFont boldSystemFontOfSize:16]; + 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),currentY + btnControlWith +11, btnControlWith, 14)]; //textLbl.backgroundColor = [UIColor blackColor]; textLbl.textAlignment = NSTextAlignmentCenter; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuoBackMsgDataUnity.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuoBackMsgDataUnity.m index 02976c9..1387fb1 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuoBackMsgDataUnity.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/SongNuo/SongNuoBackMsgDataUnity.m @@ -471,15 +471,18 @@ //加热 注意只有一个字节 加热棒只控制温度不设置开关 开关状态服务器返回 NSString*stateString6=[backModel.heatStickState substringWithRange:NSMakeRange(0, 2)]; - - if ([stateString6 isEqualToString:@"01"]) { - [JiaReBtn setImage:[UIImage imageNamed:@"JiaReBang_on.png"] forState:UIControlStateNormal]; - JiaReBtn.selected=YES; + UInt64 mac=[dataContorl hexToTen:backModel.heatTemperature]; + float TPlabel=mac/10; + int temp= (int)(TPlabel+0.5); + NSString *stringFloat = [NSString stringWithFormat:@"%d",temp]; + UILabel *lbl = [JiaReBtn viewWithTag:1]; + if ([stateString6 isEqualToString:@"01"]){ + //加热 + lbl.textColor = JWUIColorFromRGB(0x38b9fc); }else{ - JiaReBtn.selected=NO; - [JiaReBtn setImage:[UIImage imageNamed:@"JiaReBang_off.png"] forState:UIControlStateNormal]; + lbl.textColor = [UIColor lightGrayColor]; } - + lbl.text = [NSString stringWithFormat:@"%@°C", stringFloat]; } +(NSArray*)refreshSongNuoBD86TimerAddTempWithBackMassageModel:(SongNuoBDProtocol*)backModel