From 20d110de4a1f455f635846e2f0ee2bb349e48afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Mon, 23 May 2022 18:35:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=96=82=E9=B1=BC=E5=92=8C?= =?UTF-8?q?=E5=8A=9F=E7=8E=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish/Common/CommonUtils.h | 1 + Ifish/Common/CommonUtils.m | 11 +++++++++++ .../XuTo/Xuanduo2fController.m | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/Ifish/Common/CommonUtils.h b/Ifish/Common/CommonUtils.h index 818a46b..6cdc0a5 100644 --- a/Ifish/Common/CommonUtils.h +++ b/Ifish/Common/CommonUtils.h @@ -65,6 +65,7 @@ typedef enum{ + (BOOL)isIphoneX; //校验是否是数字 +(BOOL)isNumber:(NSString *)str; ++ (UIImage *)createImageWithColor:(UIColor *)color; //******************************输入内容正确性校验*****************************************// #pragma 正则匹配手机号 + (BOOL)checkTelNumber:(NSString *) telNumber; diff --git a/Ifish/Common/CommonUtils.m b/Ifish/Common/CommonUtils.m index ef403c8..1acb157 100644 --- a/Ifish/Common/CommonUtils.m +++ b/Ifish/Common/CommonUtils.m @@ -646,6 +646,17 @@ if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { titleLabel.attributedText = attributedString; } ++ (UIImage *)createImageWithColor:(UIColor *)color { + CGRect rect = CGRectMake(0.0f, 0.0f, 1.0f, 1.0f); + UIGraphicsBeginImageContext(rect.size); + CGContextRef context = UIGraphicsGetCurrentContext(); + CGContextSetFillColorWithColor(context, [color CGColor]); + CGContextFillRect(context, rect); + UIImage *theImage = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + + return theImage; +} //设置带圆角带阴影 +(void)setShadowCornerRadiusToView:(UIView *)view{ view.layer.cornerRadius = kSizeFrom750(10); diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m index 53299e1..7f49a7d 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m @@ -180,6 +180,12 @@ self.controlBtn.hidden=NO; self.cameraBtn.hidden=NO; + [self.controlBtn setTitle:@"一键喂鱼" forState:UIControlStateNormal]; + [self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal]; + [self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateSelected]; + [self.cameraBtn setTitle:@"功率" forState:UIControlStateNormal]; + [self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal]; + [self.cameraBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateHighlighted]; self.heartCount=0; } @@ -391,6 +397,19 @@ } } + else if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]) + { + [self.cameraBtn setTitle:[NSString stringWithFormat:@"%ldw",[dataContorl hexToTen:self.dataModel.powerRating]] forState:UIControlStateNormal]; + if ([self.dataModel.fishFeedStatus isEqualToString:@"01"]) + { + self.controlBtn.selected=YES; + + } + else + { + self.controlBtn.selected=NO; + } + } //杀菌灯的状态