From 083bbf164a0fa46e802983f50845cdd41d74f820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E5=8F=AA=E4=BC=9A=E7=BC=96=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E7=8B=AE=E5=AD=90?= <programer_jxf@163.com>
Date: Mon, 22 Apr 2019 22:15:25 +0800
Subject: [PATCH] =?UTF-8?q?features:1.=E6=96=B0=E7=BB=9A=E5=A4=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=81=AF=E7=9A=84=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=20=09=20=20=20=20=20=202.=E9=B1=BC=E7=BC=B8=E6=B8=A9=E5=BA=A6&?=
 =?UTF-8?q?=E8=80=97=E7=94=B5=E9=87=8F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../绚多设备/right.imageset/Contents.json     |  21 +++++++
 .../绚多设备/right.imageset/right@2x.png      | Bin 0 -> 17600 bytes
 .../XuTo/Xuanduo2DataUtility.h                |   1 +
 .../XuTo/Xuanduo2DataUtility.m                |  57 ++++++++++++++++++
 .../XuTo/Xuanduo2fController.m                |  25 +++++++-
 .../XuTo/Xuanduo2fController.xib              |   8 +++
 6 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 Ifish/Assets.xcassets/绚多设备/right.imageset/Contents.json
 create mode 100644 Ifish/Assets.xcassets/绚多设备/right.imageset/right@2x.png

diff --git a/Ifish/Assets.xcassets/绚多设备/right.imageset/Contents.json b/Ifish/Assets.xcassets/绚多设备/right.imageset/Contents.json
new file mode 100644
index 0000000..fa438e5
--- /dev/null
+++ b/Ifish/Assets.xcassets/绚多设备/right.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "right@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Ifish/Assets.xcassets/绚多设备/right.imageset/right@2x.png b/Ifish/Assets.xcassets/绚多设备/right.imageset/right@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d18c5656f2952d21012cb58a0d081d55fbb3b3
GIT binary patch
literal 17600
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

literal 0
HcmV?d00001

diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.h
index 013c694..041410d 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.h
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.h
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 +(void)readSocketDataWithBackMsgModel:(Xuanduo2Model*)xuanduoModel addWithBackData:(NSData*)data;
 
++(void)resetNewXuanduoButtonState:(UIButton*)uvLightBtn gasPumpLight:(UIButton*)gasLightBtn light1:(UIButton*)light1Btn light2:(UIButton*)light2Btn waveLight:(UIButton*)waveLightBtn huliLight:(UIButton*)huliLightBtn waterLight:(UIButton*)waterLightBtn heatLight:(UIButton*)heatLightBtn withModel:(Xuanduo2Model*)backModel;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
index b58c15d..da3d92f 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2DataUtility.m
@@ -29,4 +29,61 @@
     xuanduoModel.maxTemp = [dataString substringWithRange:NSMakeRange(80, 4)];
 }
 
++(void)resetNewXuanduoButtonState:(UIButton*)uvLightBtn gasPumpLight:(UIButton*)gasLightBtn light1:(UIButton*)light1Btn light2:(UIButton*)light2Btn waveLight:(UIButton*)waveLightBtn huliLight:(UIButton*)huliLightBtn waterLight:(UIButton*)waterLightBtn heatLight:(UIButton*)heatLightBtn withModel:(Xuanduo2Model*)backModel{
+    // 杀菌灯
+    NSString *stateString1 = [backModel.uvLamp substringWithRange:NSMakeRange(2, 2)];
+    if ([stateString1 isEqualToString:@"01"]) {
+        uvLightBtn.selected = YES;
+    }else{
+        uvLightBtn.selected = NO;
+    }
+    // 气泵
+    NSString *stateString2 = [backModel.gasPump substringWithRange:NSMakeRange(2, 2)];
+    if ([stateString2 isEqualToString:@"01"]) {
+        gasLightBtn.selected = YES;
+    }else{
+        gasLightBtn.selected = NO;
+    }
+    // 灯1
+    NSString *stateString3 = [backModel.light1 substringWithRange:NSMakeRange(2, 2)];
+    if ([stateString3 isEqualToString:@"01"]) {
+        light1Btn.selected = YES;
+    }else{
+        light1Btn.selected = NO;
+    }
+    // 灯2
+    NSString *stateString4 = [backModel.light2 substringWithRange:NSMakeRange(2, 2)];
+    if ([stateString4 isEqualToString:@"01"]) {
+        light2Btn.selected = YES;
+    }else{
+        light2Btn.selected = NO;
+    }
+    // 造浪
+    NSString *stateString5 = [backModel.waveMakingPump substringWithRange:NSMakeRange(2, 2)];
+    if ([stateString5 isEqualToString:@"01"]) {
+        waveLightBtn.selected = YES;
+    }else{
+        waveLightBtn.selected = NO;
+    }
+    // 护理灯
+    NSString *stateString6 = backModel.huliLight;
+    if ([stateString6 isEqualToString:@"01"]) {
+        huliLightBtn.selected = YES;
+    }else{
+        huliLightBtn.selected = NO;
+    }
+    NSString *stateString7 = [backModel.waterPump substringWithRange:NSMakeRange(2, 2)];
+    if ([stateString7 isEqualToString:@"01"]) {
+        waveLightBtn.selected = YES;
+    }else{
+        waveLightBtn.selected = NO;
+    }
+    NSString *stateString8 = backModel.heatStatus;
+    if ([stateString8 isEqualToString:@"01"]) {
+        heatLightBtn.selected = YES;
+    }else{
+        heatLightBtn.selected = NO;
+    }
+}
+
 @end
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
index 8bbf873..47bd935 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.m
@@ -40,6 +40,14 @@
 @property (weak, nonatomic) IBOutlet UILabel *tempLabel;
 @property (weak, nonatomic) IBOutlet UILabel *tipLabel;
 @property (nonatomic, strong) NSTimer *switchTimer;
+@property (weak, nonatomic) IBOutlet UIButton *uvLight;
+@property (weak, nonatomic) IBOutlet UIButton *gasPumpLight;
+@property (weak, nonatomic) IBOutlet UIButton *light1;
+@property (weak, nonatomic) IBOutlet UIButton *light2;
+@property (weak, nonatomic) IBOutlet UIButton *waveLight;
+@property (weak, nonatomic) IBOutlet UIButton *huliLight;
+@property (weak, nonatomic) IBOutlet UIButton *waterLight;
+@property (weak, nonatomic) IBOutlet UIButton *heatLight;
 
 @end
 
@@ -60,7 +68,7 @@
 - (void)setup{
     self.title = self.currentDevice.showName;
     //右侧菜单
-    UIImage *MyEquipmentImage = [UIImage imageNamed:@"ifishnav_dropview_list"];
+    UIImage *MyEquipmentImage = [UIImage imageNamed:@"right"];
     UIButton *rightPopButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [rightPopButton setImage:MyEquipmentImage forState:UIControlStateNormal];
     rightPopButton.frame=CGRectMake(kScreenWidth-60,0,60,44);
@@ -140,9 +148,11 @@
 
 -(void)socketDidGetBackmsgData:(NSData *)data onsoket:(AsyncSocket *)sock{
     [Xuanduo2DataUtility readSocketDataWithBackMsgModel:self.dataModel addWithBackData:data];
-    if ([self.tipLabel.text isEqualToString:@"当月电量"]) {
+    if ([self.tipLabel.text isEqualToString:@"鱼缸温度"]) {
         [self setTemperature];
     }
+    [Xuanduo2DataUtility resetNewXuanduoButtonState:self.uvLight gasPumpLight:self.gasPumpLight light1:self.light1 light2:self.light2 waveLight:self.waveLight huliLight:self.huliLight waterLight:self.waterLight heatLight:self.heatLight withModel:self.dataModel];
+    
 }
 -(void)ifishDeviceLogInFail{
     
@@ -185,9 +195,20 @@
         UInt64 mac = [dataContorl hexToTen:self.dataModel.electricity];
         NSString *stringTemp = [NSString stringWithFormat:@"%llukwh",mac];
         [self.tempLabel setAttributedText:[NSString ls_changeFontAndColor:[UIFont systemFontOfSize:15] Color:nil TotalString:stringTemp SubStringArray:@[@"kwh"]]];
+        if (!_switchTimer) {
+            _switchTimer = [NSTimer timerWithTimeInterval:3.0 target:self selector:@selector(changeTemp) userInfo:nil repeats:YES];
+            [[NSRunLoop currentRunLoop] addTimer:_switchTimer forMode:NSRunLoopCommonModes];
+        }
     }
 }
 
+- (void)changeTemp {
+    self.tipLabel.text = @"鱼缸温度";
+    [self setTemperature];
+    [_switchTimer invalidate];
+    _switchTimer = nil;
+}
+
 - (void)goBackAction{
     [[Socketsingleton sharedInstance] cutOffSocket];
     [[IfishDataUnity shareDataInstance] setAppTabRoot];
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
index a3eb8be..9563727 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
@@ -14,15 +14,23 @@
             <connections>
                 <outlet property="brandBtn" destination="KcF-jg-Mz2" id="90Z-SG-zCz"/>
                 <outlet property="brandName" destination="pjU-4c-KIu" id="7o4-eb-hHX"/>
+                <outlet property="gasPumpLight" destination="ZVe-ED-kl7" id="mbB-kR-vdN"/>
+                <outlet property="heatLight" destination="fFJ-1w-2f5" id="SYo-Yn-tUf"/>
                 <outlet property="huliLabel" destination="OLb-WT-tQ0" id="zfj-0D-wQW"/>
+                <outlet property="huliLight" destination="ucP-6q-kgn" id="88Z-Hm-G7b"/>
                 <outlet property="jiareLabel" destination="r24-bR-0zZ" id="1FX-Ye-0ju"/>
+                <outlet property="light1" destination="WFc-cF-80l" id="KWL-WD-5Ce"/>
                 <outlet property="light1Label" destination="w1W-F8-kDG" id="9Tm-jx-s9C"/>
+                <outlet property="light2" destination="RHd-Xx-AyG" id="9hu-GA-aKN"/>
                 <outlet property="light2Label" destination="k4O-MJ-aZd" id="dsc-dG-n76"/>
                 <outlet property="positionView" destination="G1c-II-WK8" id="4Cm-FT-QIK"/>
                 <outlet property="shajunLight" destination="zRG-Xz-MbP" id="LTQ-hk-FrW"/>
                 <outlet property="tempLabel" destination="brS-3x-RcE" id="eAw-p5-o08"/>
                 <outlet property="tipLabel" destination="vcu-MT-d6F" id="f4o-WG-803"/>
+                <outlet property="uvLight" destination="94R-4Q-SUx" id="Lja-bT-2GS"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outlet property="waterLight" destination="wZH-6A-6dN" id="kyb-Lh-sdc"/>
+                <outlet property="waveLight" destination="83l-yl-ndR" id="F0p-IN-WSs"/>
                 <outlet property="xunhuanLabel" destination="7KA-Hc-54C" id="QRq-jP-IC4"/>
                 <outlet property="zaolangLabel" destination="BWx-iu-nY0" id="rxl-X0-mne"/>
                 <outlet property="zengyangLabel" destination="Dse-Ih-U5R" id="sjC-JB-eMQ"/>