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

蛋分器修改

This commit is contained in:
祝发冬 2022-10-28 20:41:16 +08:00
parent 2a301d8115
commit be624dbd3e
8 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "dandenqiselected.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/绚多设备/dandenqiselected.imageset/dandenqiselected.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

21
Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "danfenqi.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
Ifish/Assets.xcassets/绚多设备/danfenqi.imageset/danfenqi.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

5
Ifish/Utinitys/DataCenter/UserExtendataArchaver.m
View File

@ -237,6 +237,11 @@
controlName.xunhuanPump = @"循环泵";
controlName.jiaRe = @"加热棒";
controlName.macAddress = macaddress;
controlName.defaultName=@"1";
}
else
{
controlName.defaultName=@"";
}
return controlName;

1
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlName.h
View File

@ -22,6 +22,7 @@
@property(nonatomic,copy) NSString *zaolangPump;
@property(nonatomic,copy) NSString *xunhuanPump;
@property(nonatomic,copy) NSString *type;
@property(nonatomic,copy) NSString *defaultName;//有值标识默认的

8
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuToControlNameViewController.m
View File

@ -94,6 +94,10 @@
if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]) {
titles = @[@"照明",@"换气",@"杀菌",@"恒温"];
}
else if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F])
{
titles= @[@"杀菌灯",@"蛋分器",@"灯光1",@"灯光2",@"造浪泵",@"护理灯",@"循环泵",@"加热棒"];
}
}else {
titles = @[@"气泵",@"灯1",@"灯2",@"护理灯",@"水泵",@"加热棒"];
}
@ -108,6 +112,10 @@
if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO3F]) {
name = [UserExtendataArchaver currentPetsXuToControlName:self.device.macAddress];
}
if ([self.device.type isEqualToString:DECICE_TYPE_XUANDUO5F]&&name.defaultName.length)
{
name.zengyangPump=@"蛋分器";
}
}else {
name = [UserExtendataArchaver currentXuToControlName:self.device.macAddress];
}

7
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
View File

@ -181,6 +181,9 @@
{
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]) {
self.imageView.image=[UIImage imageNamed:@"seaxuanduo"];
[self.gasPumpLight setBackgroundImage:[UIImage imageNamed:@"danfenqi"] forState:UIControlStateNormal];
[self.gasPumpLight setBackgroundImage:[UIImage imageNamed:@"dandenqiselected"] forState:UIControlStateSelected];
}
self.controlBtn.hidden=NO;
@ -1042,6 +1045,10 @@
{
name=[UserExtendataArchaver currentPetsXuToControlName:self.currentDevice.macAddress];
}
if ([self.currentDevice.type isEqualToString:DECICE_TYPE_XUANDUO5F]&&name.defaultName.length)
{
name.zengyangPump=@"蛋分器";
}
self.shajunLight.text = name.shajunLight;
self.zengyangLabel.text = name.zengyangPump;
self.light1Label.text = name.light1;