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

微信登陆，bug修改

Browse Source
This commit is contained in:
kai60
2020-01-09 09:25:43 +08:00
parent 82590f8fba
commit bfb68dd81c
62 changed files with 5105 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
+5 -1
View File
@@ -313,7 +313,11 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像
[self.navigationController pushViewController:vc animated:YES];
}
-(void)sBtn:(UIButton*)btn{
NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
NSString *ssidName =@"";
if (self.wifiName.length>2) {
ssidName= [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
}
if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
[alert show];
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
+3 -3
View File
@@ -1436,19 +1436,19 @@
}else if ([self.device.type isEqualToString:DECICE_TYPE_SONGNEWBD]){
//self.btnNameArr = @[@"灯1",@"灯2",@"水泵",@"氧泵",@"加热棒"];
SongNuo86Name* songNuo = [UserExtendataArchaver currentSongNuo86:self.device.macAddress];
self.btnNameArr = @[songNuo.light1,songNuo.light2,songNuo.waterPump,songNuo.airPump,songNuo.guideng,songNuo.jiaRe];
self.btnNameArr = @[songNuo.light1,songNuo.light2,songNuo.waterPump,songNuo.airPump,songNuo.guideng,songNuo.jiaRe,songNuo.jiaRe];
self.btnImgArr = @[LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_pump_off"),
LXImageWithImageName(@"bootview_022_off"),
LXImageWithImageName(@"bootview_heat_off")];
LXImageWithImageName(@"bootview_heat_off"),LXImageWithImageName(@"bootview_heat_off")];
self.btnOnImgArr = @[LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_pump_on"),
LXImageWithImageName(@"bootview_022_on"),
LXImageWithImageName(@"bootview_heat_on")];
LXImageWithImageName(@"bootview_heat_on"),LXImageWithImageName(@"bootview_heat_on")];
} else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
//self.btnNameArr = @[@"灯1",@"灯2",@"水泵",@"氧泵",@"加热棒"];