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

去掉wifi判断，宠物笼温度立即刷新

This commit is contained in:
祝发冬 2022-12-20 15:03:20 +08:00
parent 06d0979e42
commit 0474009708
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ifish.xcodeproj/project.pbxproj
View File

@ -16025,7 +16025,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18; CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -16145,7 +16145,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 18; CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;

7
Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m
View File

@ -125,7 +125,8 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
[self.view makeToast:@"请先连接设备热点"]; [self.view makeToast:@"请先连接设备热点"];
return; return;
} }
if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound||[wifiName rangeOfString:@"GW"].location!=NSNotFound) {
//wifi正确，则尝试连接设备 //wifi正确，则尝试连接设备
if(self.deviceType==DEVICECAMERA) if(self.deviceType==DEVICECAMERA)
{ {
@ -147,9 +148,7 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
[self.navigationController pushViewController:connecting animated:YES]; [self.navigationController pushViewController:connecting animated:YES];
} }
}else{
[self.view makeToast:@"WiFi名称不匹配，请重试"];
}
}]; }];
} }

9
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2SettingController.m
View File

@ -46,7 +46,7 @@ static NSString *setTimerflag = @"SetTimerCell";
@property (nonatomic,strong) NSMutableDictionary *timeDic; @property (nonatomic,strong) NSMutableDictionary *timeDic;
@property(nonatomic,copy) NSString *nextChangeDateLabel; @property(nonatomic,copy) NSString *nextChangeDateLabel;
@property(nonatomic,strong) MyHud *XuTohud; @property(nonatomic,strong) MyHud *XuTohud;
@property (nonatomic, strong) NSString* userChangedTemp;
@end @end
@implementation Xuanduo2SettingController @implementation Xuanduo2SettingController
@ -312,7 +312,7 @@ static NSString *setTimerflag = @"SetTimerCell";
float temp = mac/10.0; float temp = mac/10.0;
NSString *stringTemp = [NSString stringWithFormat:@"%.1f℃",temp]; NSString *stringTemp = [NSString stringWithFormat:@"%.1f℃",temp];
cell.temperaturelabel.textAlignment=NSTextAlignmentRight; 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; return;
} }
_userChangedTemp=[NSString stringWithFormat:@"%.1f℃",str.floatValue];
cell.temperaturelabel.text=[NSString stringWithFormat:@"%.1f℃",str.floatValue]; cell.temperaturelabel.text=_userChangedTemp;
//设置换水日期 //设置换水日期
; ;
[_remindPic removeFromSuperview]; [_remindPic removeFromSuperview];
baseModel*tempModel=[[baseModel alloc]init]; baseModel*tempModel=[[baseModel alloc]init];
tempModel.sendmacId =self.currentdevice.macAddress; tempModel.sendmacId =self.currentdevice.macAddress;