From 2a301d8115586ec4affd52072ca9f017ac39ebff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Tue, 25 Oct 2022 10:04:21 +0800 Subject: [PATCH] =?UTF-8?q?0=E5=8A=9F=E7=8E=87=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 4 ++-- .../XuTo/Xuanduo2fController.m | 6 ++++-- Ifish/ifishImgSouce/.DS_Store | Bin 14340 -> 14340 bytes 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index c852a19..398a56d 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -16025,7 +16025,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -16145,7 +16145,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m index 84731cd..a24d09c 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m @@ -184,7 +184,7 @@ } self.controlBtn.hidden=NO; - self.cameraBtn.hidden=NO; + self.cameraBtn.hidden=YES; [self.controlBtn setTitle:@"一键喂鱼" forState:UIControlStateNormal]; [self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor lightGrayColor]] forState:UIControlStateNormal]; [self.controlBtn setBackgroundImage:[CommonUtils createImageWithColor:[UIColor cyanColor]] forState:UIControlStateSelected]; @@ -454,7 +454,9 @@ } 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]; + NSInteger rate = [dataContorl hexToTen:self.dataModel.powerRating]; + [self.cameraBtn setTitle:[NSString stringWithFormat:@"%ldw",rate] forState:UIControlStateNormal]; + self.cameraBtn.hidden=rate>0?NO:YES; if ([self.dataModel.fishFeedStatus isEqualToString:@"01"]) { self.controlBtn.selected=YES; diff --git a/Ifish/ifishImgSouce/.DS_Store b/Ifish/ifishImgSouce/.DS_Store index 7db341dc63a845a688ef2952e836c8c89558add0..e580a1d37404e8b6eb39e51b29f649243189cca0 100644 GIT binary patch delta 278 zcmZoEXepTB&nUk!U^hRb(8LJ}n{@0%c7_OsQic$Q rd%iH6pLsL8!C!U&qwqds delta 224 zcmZoEXepTB&nUMsU^hRb;KT_En{@Wmj>-8F zQj;5nJeW8+CjXUG&=XfRwDnBLt*ol9sjZvI00xYV5SoD>O2epGn^k3=F>icunsGC? QLMx3eInKD5-QX`f0Aj8(R{#J2