摄像头绑定页面

This commit is contained in:
xuemh
2018-04-23 22:17:32 +08:00
parent f7734fc71e
commit 81f87eac1a
7 changed files with 257 additions and 3 deletions
@@ -27,6 +27,9 @@
#import "ThreeControlName.h"
#import "FourControlName.h"
#import "XuToControlName.h"
#import "RuiMeiCHNameCustom.h"
#import "RuiMeiCHControl.h"
@implementation MonitorBootmView
-(id)initWithFrame:(CGRect)frame
@@ -605,7 +608,9 @@
return 3 + self.device.controlAmount.integerValue +1;
}else{
} else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]) {
return 3 + 5;
} else {
if (self.device.controlAmount.integerValue ==5) {
@@ -659,6 +664,17 @@
withData:self.device
addMassglength:self.dataLength];
}else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
if (!_ruiMeiBack) {
[self makeToast:@"暂未连接"];
return;
}
[self.MonitorBottomDelegate didselectCollectionIex:indexPath
withData:self.device
addMassglength:self.dataLength];
}else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){
@@ -843,6 +859,23 @@
}
}else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
if (!_ruiMeiBack) {
[self makeToast:@"暂未连接"];
return;
}
if (indexPath.row == 7) {
//点击加热棒
[self.MonitorBottomDelegate selectRuiMeiIndex:indexPath withbackModle:_ruSun84Back];
}else{
[BootomViewSoketBackMasgConreol RuiMeiCommandSelectorWithBackMode168:_ruiMeiBack atindexPath:indexPath];
[self makeToastActivity];
}
}else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){
@@ -1124,6 +1157,14 @@
[cell setRusuan84ControlBtnImg:self.btnImgArr addArr:self.btnOnImgArr atIndex:indexPath addBackModel:_ruSun84Back];
}else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
if (!_ruiMeiBack) {
cell.controBtnImg.image = self.btnImgArr[indexPath.row - 3];
[self makeToast:@"连接设备中..."];
}
[cell setRuiMeiControlBtnImg:self.btnImgArr addArr:self.btnOnImgArr atIndex:indexPath addBackModel:_ruiMeiBack];
}else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){
@@ -1337,7 +1378,24 @@
LXImageWithImageName(@"bootview_022_on"),
LXImageWithImageName(@"bootview_heat_on")];
}else{
} 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];
self.btnImgArr = @[LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_light_off"),
LXImageWithImageName(@"bootview_shajun_off"),
LXImageWithImageName(@"bootview_co2_off"),
LXImageWithImageName(@"bootview_heat_off")];
self.btnOnImgArr = @[LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_light_on"),
LXImageWithImageName(@"bootview_shajun_on"),
LXImageWithImageName(@"bootview_co2_on"),
LXImageWithImageName(@"bootview_heat_on")];
} else{
int controlAmount=[self.device.controlAmount intValue];
@@ -1608,6 +1666,26 @@
addMassglength:string1.length];
}else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]){
//瑞美
if (!_ruiMeiBack) {
_ruiMeiBack = [[RuiMeiProtocolModel alloc] init];
}
[RuiMeiBackMsgUtils readSoketDataWithBaackMassgModel:_ruiMeiBack addWithBackData:data];
self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_RUIMEI];
[self.collectionView reloadData];
NSArray *timerArr=[RuiMeiBackMsgUtils refreshRuSunTimerAddTemperatureWithBackMassageModel:_ruiMeiBack];
[self.MonitorBottomDelegate setTimeVCReloadDatawithTimerArr:timerArr
withData:self.device
addMassglength:string1.length];
}else if ([self.device.type isEqualToString:DECICE_TYPE_JUNENGCC]){
//巨能