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

摄像头绑定页面

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
+36 -1
View File
@@ -66,6 +66,8 @@
#import "RunSun84CHSetViewController.h"
#import "HaveHotCoolWenDuPicview.h"
#import "RuSunLightOrder.h"
#import "RuiMeiSetViewController.h"
//上部分视频封装 下部分分段控制器 封装 （下一步代码优化）
@interface IfishP2PMonitorController ()<HaveHotCoolWenDuPicviewDelegate>
{
@@ -103,6 +105,7 @@
@property(nonatomic,strong) KeLiAiSetViewController *keLiAiSetVc;
@property(nonatomic,strong) RusunHaveHeateSetViewController *rusunSet;
@property(nonatomic,strong) RunSun84CHSetViewController *rusun84Set;
@property (nonatomic, strong) RuiMeiSetViewController *ruimeiSet;
@property(nonatomic,strong) DXPopover *popover;
@property(nonatomic,strong) UIButton *rightPopButton;
@property (nonatomic,strong) SetNameTextViewController *setNameVC;
@@ -468,7 +471,7 @@
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
UIButton*leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
leftBtn.frame = CGRectMake(0, 0, 47,44);
[leftBtn setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
[leftBtn setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
[leftBtn addTarget: self action: @selector(btnClickToBack:) forControlEvents: UIControlEventTouchUpInside];
UIBarButtonItem * lbbItem=[[UIBarButtonItem alloc]initWithCustomView:leftBtn];
self.navigationItem.leftBarButtonItem=lbbItem;
@@ -4002,6 +4005,19 @@
[self.navigationController pushViewController:_rusun84Set animated:YES];
}else if ([dmodel.type isEqualToString:DECICE_TYPE_RUIMEI]){
_ruimeiSet = [[RuiMeiSetViewController alloc] init];
_ruimeiSet.currentdevice = dmodel;
NSString*stateString=[self.fishControlView.ruiMeiBack.customModel substringWithRange:NSMakeRange(2, 2)];
if ([stateString isEqualToString:@"01"]) {
_ruimeiSet.customModeOn=YES;
}else{
_ruimeiSet.customModeOn=NO;
}
usleep(50*1000);
[self.navigationController pushViewController:_ruimeiSet animated:YES];
}else if ([dmodel.type isEqualToString:DECICE_TYPE_JUNENGCC]){
@@ -4149,6 +4165,19 @@
[_rusun84Set.tableView reloadData];
}else if ([dmodel.type isEqualToString:DECICE_TYPE_RUIMEI]){
_ruimeiSet.timeArr = timerArr;
[_ruimeiSet.indicatorView stopAnimating];
NSString*stateString=[self.fishControlView.ruiMeiBack.customModel substringWithRange:NSMakeRange(2, 2)];
if ([stateString isEqualToString:@"01"]) {
_ruimeiSet.customModeOn=YES;
}else{
_ruimeiSet.customModeOn=NO;
}
[_ruimeiSet.tableView reloadData];
}else if ([dmodel.type isEqualToString:DECICE_TYPE_JUNENGCC]){
@@ -4571,7 +4600,13 @@
[self setHotCoolMianQueueWithUint64:mac];
}
#pragma mark - 瑞美
-(void)selectRuiMeiIndex:(NSIndexPath *)index withbackModle:(RunSun84Protocol *)backModel {
RuiMeiProtocolModel*backmodel=[[DataCenter defaultDtacenter]valueForKey:DataCenterRuiMeiModelKey];
UInt64 mac=[dataContorl hexToTen:backmodel.heatTemperature];
[self setHotCoolMianQueueWithUint64:mac];
}
#pragma mark - 松诺BD 加热棒
-(void)selectSongNuoBDIndex:(NSIndexPath *)index withBackModel:(SongNuoBDProtocol *)backModel{