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

UI调整，摄像头入口替换

This commit is contained in:
祝发冬 2022-08-13 13:52:48 +08:00
parent deb671cd0a
commit 77016f37a4
8 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoSettingController.h
View File

@ -8,7 +8,7 @@
#import "FatherController.h" #import "FatherController.h"
#import "IfishDeviceInfo.h" #import "IfishDeviceInfo.h"
#include "xuanduo3fModel.h" //#include "xuanduo3fModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN

4
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduofishFeedViewController.m
View File

@ -539,6 +539,10 @@ static NSString *timerTypeFlag = @"TimerTypeTableViewCell";
} }
[headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]]; [headerView configWithImageName:_imgArr[section-2] labelName:_titieArr[section-2]];
if (section==7)
{
headerView.backImageView.image=[UIImage imageNamed:@"bottomRound"];
}
return headerView; return headerView;
} }

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

@ -7,6 +7,7 @@
// //
#import "IfishP2PMonitorController.h" #import "IfishP2PMonitorController.h"
#import "XuanduoSettingController.h"
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <AssetsLibrary/AssetsLibrary.h> #import <AssetsLibrary/AssetsLibrary.h>
@ -4073,11 +4074,25 @@ GWP2PCallErrorNotSupport,
-(void)didselectXuanduo2SetttngWithData:(DeviceModel *)dmodel -(void)didselectXuanduo2SetttngWithData:(DeviceModel *)dmodel
andBackModel:(Xuanduo2Model *)backmodel { andBackModel:(Xuanduo2Model *)backmodel {
Xuanduo2SettingController *setVC = [[Xuanduo2SettingController alloc] init]; if ([dmodel.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[dmodel.type isEqualToString:DECICE_TYPE_XUANDUO5F])
setVC.currentdevice = dmodel; {
setVC.dataModel = backmodel; XuanduoSettingController *setVC = [[XuanduoSettingController alloc] init];
usleep(50*1000); setVC.currentdevice = dmodel;
[self.navigationController pushViewController:setVC animated:YES]; setVC.dataModel = backmodel;
usleep(50*1000);
[self.navigationController pushViewController:setVC animated:YES];
}
else
{
Xuanduo2SettingController *setVC = [[Xuanduo2SettingController alloc] init];
setVC.currentdevice = dmodel;
setVC.dataModel = backmodel;
usleep(50*1000);
[self.navigationController pushViewController:setVC animated:YES];
}
} }
//炫多 //炫多

2
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/yooseFishTankView/BootomViewSoketBackMasgConreol.m
View File

@ -90,7 +90,7 @@
//瑞美 //瑞美
str=[str substringWithRange:NSMakeRange(148,IFISH_TEMPERATURE_BYTE2)]; str=[str substringWithRange:NSMakeRange(148,IFISH_TEMPERATURE_BYTE2)];
}else if ([type isEqualToString:DECICE_TYPE_XUANDUO2F]){ }else if ([type isEqualToString:DECICE_TYPE_XUANDUO2F]||[type isEqualToString:DECICE_TYPE_XUANDUO4F]||[type isEqualToString:DECICE_TYPE_XUANDUO5F]){
str=[str substringWithRange:NSMakeRange(60,IFISH_TEMPERATURE_BYTE2)]; str=[str substringWithRange:NSMakeRange(60,IFISH_TEMPERATURE_BYTE2)];
} }
else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]){ else if ([type isEqualToString:DECICE_TYPE_XUANDUO3F]){

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

@ -618,7 +618,7 @@
} else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]) { } else if ([self.device.type isEqualToString:DECICE_TYPE_RUIMEI]) {
return 3 + 5; return 3 + 5;
} else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ } else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){
return 3 + self.device.controlAmount.integerValue + 1; return 3 + self.device.controlAmount.integerValue + 1;
} }
else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){
@ -704,7 +704,7 @@
withData:self.device withData:self.device
addMassglength:self.dataLength]; addMassglength:self.dataLength];
}else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){
if (!_xuanduoBack) { if (!_xuanduoBack) {
[self makeToast:@"暂未连接"]; [self makeToast:@"暂未连接"];
return; return;
@ -956,13 +956,13 @@
} }
[self makeToastActivity:CSToastPositionCenter]; [self makeToastActivity:CSToastPositionCenter];
}else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){
// 新绚多 // 新绚多
if (!_xuanduoBack) { if (!_xuanduoBack) {
[self makeToast:@"暂未连接"]; [self makeToast:@"暂未连接"];
return; return;
} }
if (indexPath.row == 10 || (indexPath.row == 3&&[self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F])) { if (indexPath.row == 10 || (indexPath.row == 3&&([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]))) {
//点击加热棒 //点击加热棒
[self.MonitorBottomDelegate selectXuanduo2Index:indexPath withBackModel:_xuanduoBack]; [self.MonitorBottomDelegate selectXuanduo2Index:indexPath withBackModel:_xuanduoBack];
}else{ }else{
@ -1151,7 +1151,7 @@
} }
UInt64 mac = 0; UInt64 mac = 0;
NSLog(@"%llu",mac); NSLog(@"%llu",mac);
if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]) { if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]) {
Xuanduo2Model*model=(Xuanduo2Model*)_xuanduoBack; Xuanduo2Model*model=(Xuanduo2Model*)_xuanduoBack;
mac=[dataContorl hexToTen:model.waterTemperature]; mac=[dataContorl hexToTen:model.waterTemperature];
} }
@ -1281,7 +1281,7 @@
[cell setSongNuoBDControBtnImg:self.btnImgArr addArr:self.btnOnImgArr atIndex:indexPath addBackModel:_songNuoBDBack]; [cell setSongNuoBDControBtnImg:self.btnImgArr addArr:self.btnOnImgArr atIndex:indexPath addBackModel:_songNuoBDBack];
}else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){
if (!_xuanduoBack) { if (!_xuanduoBack) {
cell.controBtnImg.image = self.btnImgArr[indexPath.row - 3]; cell.controBtnImg.image = self.btnImgArr[indexPath.row - 3];
[self makeToast:@"连接设备中..."]; [self makeToast:@"连接设备中..."];
@ -1505,7 +1505,7 @@
LXImageWithImageName(@"bootview_co2_on"), LXImageWithImageName(@"bootview_co2_on"),
LXImageWithImageName(@"bootview_heat_on")]; LXImageWithImageName(@"bootview_heat_on")];
}else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){
self.btnNameArr = @[@"循环泵",@"增氧泵",@"灯光1",@"灯光2",@"造浪泵",@"杀菌灯",@"护理灯",@"加热棒"]; self.btnNameArr = @[@"循环泵",@"增氧泵",@"灯光1",@"灯光2",@"造浪泵",@"杀菌灯",@"护理灯",@"加热棒"];
self.btnImgArr = @[[UIImage imageNamed:@"xunhuan_noraml"], self.btnImgArr = @[[UIImage imageNamed:@"xunhuan_noraml"],
@ -1865,13 +1865,13 @@
addMassglength:string1.length]; addMassglength:string1.length];
}else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO2F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO4F]||[self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]){
// 新绚多 // 新绚多
if (!_xuanduoBack) { if (!_xuanduoBack) {
_xuanduoBack = [[Xuanduo2Model alloc] init]; _xuanduoBack = [[Xuanduo2Model alloc] init];
} }
[Xuanduo2DataUtility readSocketDataWithBackMsgModel:_xuanduoBack addWithBackData:data type:DECICE_TYPE_XUANDUO2F]; [Xuanduo2DataUtility readSocketDataWithBackMsgModel:_xuanduoBack addWithBackData:data type:self.device.type];
self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:DECICE_TYPE_XUANDUO2F]; self.temperature = [BootomViewSoketBackMasgConreol getTempNewWayWithSoketData:data adddeviceType:self.device.type];
[self.collectionView reloadData]; [self.collectionView reloadData];
}else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){ }else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]){
// 新绚多 // 新绚多

BIN
Ifish/ifishImgSouce/XuToImg/bottomRound.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
Ifish/ifishImgSouce/XuToImg/centerrect.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Ifish/ifishImgSouce/XuToImg/topround.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB