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

修改温度颜色和字体，版本号

Browse Source
This commit is contained in:
祝发冬
2023-07-21 11:23:35 +08:00
parent 85f50867ae
commit fb139ab149
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish.xcodeproj/project.pbxproj
+2 -2
View File
@@ -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",
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
+4 -4
View File
@@ -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];