From fb139ab149c5eb9f223c57fdc12f6a2ee90c83df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Fri, 21 Jul 2023 11:23:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=A9=E5=BA=A6=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=92=8C=E5=AD=97=E4=BD=93=EF=BC=8C=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 4 ++-- .../CenterontrolControllers/XuTo/Xuanduo2DataUtility.m | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 060f4b9..83aa041 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -16102,7 +16102,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.23; + MARKETING_VERSION = 5.1.24; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -16222,7 +16222,7 @@ "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl", "$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl", ); - MARKETING_VERSION = 5.1.23; + MARKETING_VERSION = 5.1.24; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-ObjC", diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m index 871aff6..4adee9e 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m @@ -151,14 +151,14 @@ UInt64 mac=[dataContorl hexToTen:backModel.heatingTemperature]; //float TPlabel=mac/10+(mac%10)*0.1; - float temp = mac/10.0; - NSString *stringTemp = [NSString stringWithFormat:@"%.1f℃",temp]; + int temp = mac/10.0; + NSString *stringTemp = [NSString stringWithFormat:@"%d℃",temp]; UIImage*imageTempNomal=[UIImage imageNamed:@"jiare_normal"]; - imageTempNomal=[imageTempNomal imageWaterMarkWithString:stringTemp rect:CGRectMake(20, 25, 60, 40) attribute:@{NSForegroundColorAttributeName:[UIColor redColor],NSFontAttributeName:[UIFont systemFontOfSize:25]}]; + imageTempNomal=[imageTempNomal imageWaterMarkWithString:stringTemp rect:CGRectMake(20, 25, 60, 40) attribute:@{NSForegroundColorAttributeName:UIColorFromRGB(0xd2d2d2),NSFontAttributeName:[UIFont systemFontOfSize:25]}]; [heatLightBtn setImage:imageTempNomal forState:UIControlStateNormal]; UIImage*imageTempsel=[UIImage imageNamed:@"jiare_selected"]; - imageTempsel=[imageTempsel imageWaterMarkWithString:stringTemp rect:CGRectMake(20, 25, 60, 40) attribute:@{NSForegroundColorAttributeName:[UIColor redColor],NSFontAttributeName:[UIFont systemFontOfSize:18]}]; + imageTempsel=[imageTempsel imageWaterMarkWithString:stringTemp rect:CGRectMake(20, 25, 60, 40) attribute:@{NSForegroundColorAttributeName:UIColorFromRGB(0x90F2F6),NSFontAttributeName:[UIFont systemFontOfSize:25]}]; [heatLightBtn setImage:imageTempsel forState:UIControlStateSelected];