diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 4ae5bb1..58ee288 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2463,6 +2463,7 @@ E547870F2073192E0060C2C2 /* introlImage_iphonex_1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870C2073192D0060C2C2 /* introlImage_iphonex_1.jpg */; }; E54787102073192E0060C2C2 /* introlImage_iphonex_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */; }; E54787112073192E0060C2C2 /* introlImage_iphonex_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */; }; + E548F39720A557B7004CF1BC /* JiaReBang.png in Resources */ = {isa = PBXBuildFile; fileRef = E548F39620A557B5004CF1BC /* JiaReBang.png */; }; E58C9980208189780004C42B /* back_btn_1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E58C997F208189780004C42B /* back_btn_1@2x.png */; }; E58C9984208195640004C42B /* RuiMeiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C9983208195640004C42B /* RuiMeiViewController.m */; }; E58C99872081A3BA0004C42B /* RuiMeiProtocolModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C99862081A3BA0004C42B /* RuiMeiProtocolModel.m */; }; @@ -6241,6 +6242,7 @@ E547870C2073192D0060C2C2 /* introlImage_iphonex_1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_1.jpg; sourceTree = ""; }; E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_2.jpg; sourceTree = ""; }; E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_3.jpg; sourceTree = ""; }; + E548F39620A557B5004CF1BC /* JiaReBang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JiaReBang.png; sourceTree = ""; }; E58C997F208189780004C42B /* back_btn_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_btn_1@2x.png"; sourceTree = ""; }; E58C9982208195640004C42B /* RuiMeiViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiViewController.h; sourceTree = ""; }; E58C9983208195640004C42B /* RuiMeiViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiViewController.m; sourceTree = ""; }; @@ -8183,7 +8185,6 @@ 8864843A1EE171D30046C3BD /* redact_line_pointgray@2x.png */, 8864843B1EE171D30046C3BD /* redact_line_pointgray@3x.png */, 8864843C1EE171D30046C3BD /* redact_line.png */, - 8864843D1EE171D30046C3BD /* redact_line@2x.png */, 8864843E1EE171D30046C3BD /* redact_line@3x.png */, 882955111DBDA3A100E9DDD7 /* bubble@1x.png */, 882955121DBDA3A100E9DDD7 /* bubble@2x.png */, @@ -8196,7 +8197,9 @@ 882955191DBDA3A100E9DDD7 /* DanBai_off.png */, 8829551A1DBDA3A100E9DDD7 /* DanBai_on.png */, 8829551B1DBDA3A100E9DDD7 /* graybtn_big.png */, + 8864843D1EE171D30046C3BD /* redact_line@2x.png */, 8829551C1DBDA3A100E9DDD7 /* guidengCell_back.png */, + E548F39620A557B5004CF1BC /* JiaReBang.png */, 8829551D1DBDA3A100E9DDD7 /* JiaReBang_off.png */, 8829551E1DBDA3A100E9DDD7 /* JiaReBang_on.png */, 8829551F1DBDA3A100E9DDD7 /* line.png */, @@ -15029,6 +15032,7 @@ 882956D21DBDA3A300E9DDD7 /* ifish_qiehuan_device@2x.png in Resources */, 8829A5591EA78F56005A76CB /* ifish_loading_hold@2x.png in Resources */, 885FBE171E4D66C000E0D7D1 /* merchant_iocn_a_commodity@2x.png in Resources */, + E548F39720A557B7004CF1BC /* JiaReBang.png in Resources */, 8856B0E81DEC15F5009D384A /* home_popup_cancel@2x.png in Resources */, 883E78F41D48A5E50030E075 /* SecondConnectWifiController.xib in Resources */, 88602F921E12002600F3DB5D /* NTESFilePreViewController.xib in Resources */, diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m index eaabd7a..14d57c4 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiBackMsgUtils.m @@ -130,19 +130,19 @@ // 加热制冷 状态 1字节 NSString*stateString6=[backModel.heatStickState substringWithRange:NSMakeRange(0, 2)]; - + UInt64 mac=[dataContorl hexToTen:backModel.heatTemperature]; + float TPlabel=mac/10; + int temp= (int)(TPlabel+0.5); + NSString *stringFloat = [NSString stringWithFormat:@"%d",temp]; + [jiaReBang setImage:nil forState:UIControlStateNormal]; + if ([stateString6 isEqualToString:@"01"]){ //加热 - [jiaReBang setImage:[UIImage imageNamed:@"JiaReBang_on"] forState:UIControlStateNormal]; - jiaReBang.selected=YES; - + [jiaReBang setTitleColor:JWUIColorFromRGB(0x38b9fc) forState:UIControlStateNormal]; }else{ - //制冷 - - [jiaReBang setImage:[UIImage imageNamed:@"JiaReBang_off"] forState:UIControlStateNormal]; - jiaReBang.selected=NO; - + [jiaReBang setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal]; } + [jiaReBang setTitle:stringFloat forState:UIControlStateNormal]; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m index ce48705..8772fd3 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuiMei/RuiMeiViewController.m @@ -113,7 +113,7 @@ -(void)initControlNormalBtn { - NSArray*nameArr=@[@"PFLight1_off.png",@"PFLight1_off.png",@"PFkilLlight_off.png",@"O2_off.png",@"JiaReBang_off"]; + NSArray*nameArr=@[@"PFLight1_off.png",@"PFLight1_off.png",@"PFkilLlight_off.png",@"O2_off.png",@"JiaReBang"]; CGFloat btnControlWith = 70; CGFloat btnControlPlace = (kScreenSize.width - 3*btnControlWith )/4; @@ -165,7 +165,7 @@ self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -25 -5 , btnControlWith, btnControlWith + 11); - [self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal]; + [self.button setBackgroundImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal]; self.button.tag= 6003+i; [self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside]; @@ -506,7 +506,7 @@ if (!_backmodel.heatStickState) { _backmodel.heatStickState = @"00"; } - UInt64 mac=[dataContorl hexToTen:_backmodel.heatTemperature]; + UInt64 mac=[dataContorl hexToTen:_backmodel.shiwen]; float TPlabel=mac/10; int temp= (int)(TPlabel+0.5); NSString *stringFloat = [NSString stringWithFormat:@"%d°C",temp]; diff --git a/Ifish/ifishImgSouce/NewPiFubtn/JiaReBang.png b/Ifish/ifishImgSouce/NewPiFubtn/JiaReBang.png new file mode 100644 index 0000000..d66fa35 Binary files /dev/null and b/Ifish/ifishImgSouce/NewPiFubtn/JiaReBang.png differ