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

修复两处崩溃

This commit is contained in:
xuemh 2018-04-24 09:41:36 +08:00
parent 81f87eac1a
commit 41527b58c9
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>469</string>
<string>471</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

10
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -4602,10 +4602,16 @@
#pragma mark - 瑞美
-(void)selectRuiMeiIndex:(NSIndexPath *)index withbackModle:(RunSun84Protocol *)backModel {
-(void)selectRuiMeiIndex:(NSIndexPath *)index withbackModle:(RuiMeiProtocolModel *)backModel {
[self showWenDuPic];
[self setMeiMianQueue];
}
-(void)setMeiMianQueue
{
RuiMeiProtocolModel*backmodel=[[DataCenter defaultDtacenter]valueForKey:DataCenterRuiMeiModelKey];
UInt64 mac=[dataContorl hexToTen:backmodel.heatTemperature];
[self setHotCoolMianQueueWithUint64:mac];
[self setMianQueueWithUint64:mac];
}
#pragma mark - 松诺BD 加热棒

6
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
View File

@ -867,7 +867,7 @@
if (indexPath.row == 7) {
//点击加热棒
[self.MonitorBottomDelegate selectRuiMeiIndex:indexPath withbackModle:_ruSun84Back];
[self.MonitorBottomDelegate selectRuiMeiIndex:indexPath withbackModle:_ruiMeiBack];
}else{
@ -1380,8 +1380,8 @@
} else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
//self.btnNameArr = @[@"灯1",@"灯2",@"水泵",@"氧泵",@"加热棒"];
RuiMeiCHControl* songNuo = [UserExtendataArchaver unArchiverRuiMeiDeviceCHInfo:self.device.macAddress];
self.btnNameArr = @[songNuo.ch1name,songNuo.ch2name,songNuo.ch3name,songNuo.ch4name,songNuo.jiaRe];
RuiMeiCHControl* ruimei = [RuiMeiCHNameCustom currentdevice:self.device.macAddress];
self.btnNameArr = @[ruimei.ch1name,ruimei.ch2name,ruimei.ch3name,ruimei.ch4name,ruimei.jiaRe];
self.btnImgArr = @[LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"),