diff --git a/Ifish/Info.plist b/Ifish/Info.plist
index 720ed50..2358e83 100644
--- a/Ifish/Info.plist
+++ b/Ifish/Info.plist
@@ -70,7 +70,7 @@
CFBundleVersion
- 469
+ 471
ITSAppUsesNonExemptEncryption
LSApplicationCategoryType
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
index 6f89ec3..9241b79 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
@@ -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 加热棒
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
index 1cda06b..082494b 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/MonitorBootmView.m
@@ -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"),