From 0474009708c7cbe5c2c918ac4a43d1e19b4f897b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= Date: Tue, 20 Dec 2022 15:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89wifi=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=AE=A0=E7=89=A9=E7=AC=BC=E6=B8=A9=E5=BA=A6=E7=AB=8B?= =?UTF-8?q?=E5=8D=B3=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 4 ++-- .../controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m | 7 +++---- .../XuTo/Xuanduo2SettingController.m | 9 +++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index dec2942..b178116 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 = 18; + CURRENT_PROJECT_VERSION = 19; 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 = 18; + CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m index 6b099d1..7bb367a 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m @@ -125,7 +125,8 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi [self.view makeToast:@"请先连接设备热点"]; return; } - if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound) { + + //wifi正确，则尝试连接设备 if(self.deviceType==DEVICECAMERA) { @@ -147,9 +148,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi [self.navigationController pushViewController:connecting animated:YES]; } - }else{ - [self.view makeToast:@"WiFi名称不匹配，请重试"]; - } + }]; } diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m index fd3e88e..faa661b 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m @@ -46,7 +46,7 @@ static NSString *setTimerflag = @"SetTimerCell"; @property (nonatomic,strong) NSMutableDictionary *timeDic; @property(nonatomic,copy) NSString *nextChangeDateLabel; @property(nonatomic,strong) MyHud *XuTohud; - +@property (nonatomic, strong) NSString* userChangedTemp; @end @implementation Xuanduo2SettingController @@ -312,7 +312,7 @@ static NSString *setTimerflag = @"SetTimerCell"; float temp = mac/10.0; NSString *stringTemp = [NSString stringWithFormat:@"%.1f℃",temp]; cell.temperaturelabel.textAlignment=NSTextAlignmentRight; - [cell.temperaturelabel setAttributedText:[NSString ls_changeFontAndColor:[UIFont systemFontOfSize:15] Color:nil TotalString:stringTemp SubStringArray:@[@"℃"]]]; + cell.temperaturelabel.text=_userChangedTemp?:stringTemp; @@ -1295,10 +1295,11 @@ static NSString *setTimerflag = @"SetTimerCell"; return; } - - cell.temperaturelabel.text=[NSString stringWithFormat:@"%.1f℃",str.floatValue]; + _userChangedTemp=[NSString stringWithFormat:@"%.1f℃",str.floatValue]; + cell.temperaturelabel.text=_userChangedTemp; //设置换水日期 ; + [_remindPic removeFromSuperview]; baseModel*tempModel=[[baseModel alloc]init]; tempModel.sendmacId =self.currentdevice.macAddress;