From e2faf52575f0872078f1261654f887080bd63a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= <zhufadong@163.com>
Date: Wed, 20 Jul 2022 18:42:07 +0800
Subject: [PATCH] =?UTF-8?q?UI=E5=92=8C=E7=81=AF=E5=8F=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ifish.xcodeproj/project.pbxproj               |  16 +++++-
 .../XuTo/PlusTableViewCell.h                  |   1 +
 .../XuTo/PlusTableViewCell.xib                |  15 +++--
 .../XuTo/SetTimerCell.h                       |   1 +
 .../XuTo/SetTimerCell.xib                     |  12 ++++
 .../XuTo/XuanduoTimerSettingViewController.m  |  54 ++----------------
 Ifish/ifishImgSouce/XuToImg/bottomRound.png   | Bin 0 -> 3697 bytes
 Ifish/ifishImgSouce/XuToImg/centerrect.png    | Bin 0 -> 2994 bytes
 Ifish/ifishImgSouce/XuToImg/topround.png      | Bin 0 -> 3640 bytes
 9 files changed, 41 insertions(+), 58 deletions(-)
 create mode 100644 Ifish/ifishImgSouce/XuToImg/bottomRound.png
 create mode 100644 Ifish/ifishImgSouce/XuToImg/centerrect.png
 create mode 100644 Ifish/ifishImgSouce/XuToImg/topround.png

diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index a6c329b..ffe597d 100644
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@@ -2301,6 +2301,9 @@
 		C038964E284332040073E88F /* ElectricityView.h in Headers */ = {isa = PBXBuildFile; fileRef = C038964C284332040073E88F /* ElectricityView.h */; };
 		C038964F284332040073E88F /* ElectricityView.m in Sources */ = {isa = PBXBuildFile; fileRef = C038964D284332040073E88F /* ElectricityView.m */; };
 		C0389651284332170073E88F /* ElectricityView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0389650284332170073E88F /* ElectricityView.xib */; };
+		C0553C2628856DBD00AB7B50 /* topround.png in Resources */ = {isa = PBXBuildFile; fileRef = C0553C2428856DBC00AB7B50 /* topround.png */; };
+		C0553C2728856DBD00AB7B50 /* bottomRound.png in Resources */ = {isa = PBXBuildFile; fileRef = C0553C2528856DBD00AB7B50 /* bottomRound.png */; };
+		C0553C292885962B00AB7B50 /* centerrect.png in Resources */ = {isa = PBXBuildFile; fileRef = C0553C282885962A00AB7B50 /* centerrect.png */; };
 		C057166C282376CC004F113A /* UIButton+ImageTitleStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = C057166A282376CC004F113A /* UIButton+ImageTitleStyle.h */; };
 		C057166D282376CC004F113A /* UIButton+ImageTitleStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */; };
 		C05716702823D653004F113A /* XuanduoTimerListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C057166E2823D652004F113A /* XuanduoTimerListViewController.h */; };
@@ -5817,6 +5820,9 @@
 		C038964C284332040073E88F /* ElectricityView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElectricityView.h; sourceTree = "<group>"; };
 		C038964D284332040073E88F /* ElectricityView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElectricityView.m; sourceTree = "<group>"; };
 		C0389650284332170073E88F /* ElectricityView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ElectricityView.xib; sourceTree = "<group>"; };
+		C0553C2428856DBC00AB7B50 /* topround.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = topround.png; sourceTree = "<group>"; };
+		C0553C2528856DBD00AB7B50 /* bottomRound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bottomRound.png; sourceTree = "<group>"; };
+		C0553C282885962A00AB7B50 /* centerrect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = centerrect.png; sourceTree = "<group>"; };
 		C057166A282376CC004F113A /* UIButton+ImageTitleStyle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+ImageTitleStyle.h"; sourceTree = "<group>"; };
 		C057166B282376CC004F113A /* UIButton+ImageTitleStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+ImageTitleStyle.m"; sourceTree = "<group>"; };
 		C057166E2823D652004F113A /* XuanduoTimerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XuanduoTimerListViewController.h; sourceTree = "<group>"; };
@@ -9059,7 +9065,10 @@
 				FA08931D2275FCF10084A609 /* light_big@2x.png */,
 				FA0893092275DD770084A609 /* shajun_big@2x.png */,
 				882955A11DBDA3A100E9DDD7 /* secondSetCell.png */,
+				C0553C2528856DBD00AB7B50 /* bottomRound.png */,
+				C0553C2428856DBC00AB7B50 /* topround.png */,
 				882955A21DBDA3A100E9DDD7 /* set_cellBack.png */,
+				C0553C282885962A00AB7B50 /* centerrect.png */,
 				C01B988A282F802E004FF42D /* arrow_right@2x.png */,
 				C08976AD282117920098B5FA /* 矩形.png */,
 				C08976AE282117920098B5FA /* 矩形@2x.png */,
@@ -13768,6 +13777,7 @@
 				8871FAF61EBC62FA0038E99A /* attestation_next_button@3x.png in Resources */,
 				882958131DC04ED200E9DDD7 /* equipment_background@3x.png in Resources */,
 				8871C4A11E6D507B000AA49F /* signin_condition_gift_achieve@3x.png in Resources */,
+				C0553C292885962B00AB7B50 /* centerrect.png in Resources */,
 				882956EA1DBDA3A300E9DDD7 /* ifish_yoosee_device.png in Resources */,
 				8832833A1EAEE60500A47157 /* ifish_discovery_off@2x.png in Resources */,
 				886CB95D1E63F35C00BCB892 /* home_iocn_signin@3x.png in Resources */,
@@ -14756,12 +14766,14 @@
 				8829566C1DBDA3A200E9DDD7 /* shop_certifycheck.png in Resources */,
 				8871FB111EBC80850038E99A /* FishSelectDeviceListViewCell.xib in Resources */,
 				886CB95B1E63F35C00BCB892 /* home_iocn_signin.png in Resources */,
+				C0553C2628856DBD00AB7B50 /* topround.png in Resources */,
 				8891332C1ECE99B900F52EBC /* recording_iocn_over@2x.png in Resources */,
 				885FBE131E4D66C000E0D7D1 /* merchant_iocn_a_attestation.png in Resources */,
 				8871FB1C1EBC822B0038E99A /* select_aquarium@2x.png in Resources */,
 				885FBE301E4DAB4500E0D7D1 /* merchant_iocn_shop@3x.png in Resources */,
 				88F23F2C1EA9D18700E4D298 /* live_botton_uncheck_like@3x.png in Resources */,
 				8853D99B1E24EED700776BF4 /* ShuoMingShuCell.xib in Resources */,
+				C0553C2728856DBD00AB7B50 /* bottomRound.png in Resources */,
 				FAFC08252279CB5900B5A07B /* SetTimerCell.xib in Resources */,
 				882956031DBDA3A100E9DDD7 /* neves0006.png in Resources */,
 				88C1B2111DCC5A1400C2C99A /* personal_iocn_about.png in Resources */,
@@ -16013,7 +16025,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16132,7 +16144,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.h
index 8ba404a..deb3bff 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.h
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.h
@@ -11,6 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface PlusTableViewCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UIImageView *backImageView;
 @property (weak, nonatomic) IBOutlet UIButton *addTimerBtn;
 
 @end
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.xib
index 17e44f0..93dec25 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/PlusTableViewCell.xib
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,11 +14,11 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ifishSetCell_back.png" translatesAutoresizingMaskIntoConstraints="NO" id="Hc6-I7-yDU">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                     </imageView>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6h6-2g-eDK">
                         <rect key="frame" x="137" y="17" width="46" height="46"/>
@@ -44,12 +42,13 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
                 <outlet property="addTimerBtn" destination="6h6-2g-eDK" id="Jsg-om-i4G"/>
+                <outlet property="backImageView" destination="Hc6-I7-yDU" id="yB6-1d-Rrx"/>
             </connections>
             <point key="canvasLocation" x="52.799999999999997" y="149.32533733133434"/>
         </tableViewCell>
     </objects>
     <resources>
-        <image name="add.png" width="46" height="46"/>
+        <image name="add.png" width="46.5" height="46.5"/>
         <image name="ifishSetCell_back.png" width="1080" height="140"/>
     </resources>
 </document>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.h b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.h
index ab5035c..301f5cf 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.h
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.h
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SetTimerCell : UITableViewCell
 
+@property (weak, nonatomic) IBOutlet UIImageView *backImageView;
 @property (weak, nonatomic) IBOutlet UIButton *switchBtn;
 @property (weak, nonatomic) IBOutlet UILabel *titleLabel;
 @property (weak, nonatomic) IBOutlet UILabel *timerLabel;
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib
index 6e3d0a8..eeff484 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib
@@ -20,6 +20,13 @@
                     <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ifishSetCell_back.png" translatesAutoresizingMaskIntoConstraints="NO" id="P3o-KY-LIT">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
                     </imageView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AW2-Ki-aud" userLabel="lineView">
+                        <rect key="frame" x="0.0" y="49.5" width="320" height="0.5"/>
+                        <color key="backgroundColor" red="0.25490196078431371" green="0.25490196078431371" blue="0.25490196078431371" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="Kkl-9d-H0c"/>
+                        </constraints>
+                    </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时段1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yY6-WX-OcS">
                         <rect key="frame" x="28" y="17" width="33" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -47,19 +54,24 @@
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="P3o-KY-LIT" secondAttribute="trailing" id="2yN-ro-gmU"/>
+                    <constraint firstItem="AW2-Ki-aud" firstAttribute="width" secondItem="P3o-KY-LIT" secondAttribute="width" id="7Df-NX-Hzi"/>
                     <constraint firstAttribute="trailing" secondItem="SDK-gA-raP" secondAttribute="trailing" constant="28" id="7Ux-nN-8iv"/>
                     <constraint firstAttribute="bottom" secondItem="P3o-KY-LIT" secondAttribute="bottom" id="8Bd-g4-FLv"/>
+                    <constraint firstItem="AW2-Ki-aud" firstAttribute="leading" secondItem="P3o-KY-LIT" secondAttribute="leading" id="KEg-pL-yYb"/>
                     <constraint firstItem="P3o-KY-LIT" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="LcH-qx-fyJ"/>
                     <constraint firstItem="P3o-KY-LIT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="N6V-Tp-Fcx"/>
                     <constraint firstItem="hQu-ZP-ugr" firstAttribute="centerY" secondItem="yY6-WX-OcS" secondAttribute="centerY" id="ZaA-96-fkI"/>
                     <constraint firstItem="hQu-ZP-ugr" firstAttribute="leading" secondItem="yY6-WX-OcS" secondAttribute="trailing" constant="55" id="c5H-Ak-EAF"/>
                     <constraint firstItem="yY6-WX-OcS" firstAttribute="centerY" secondItem="P3o-KY-LIT" secondAttribute="centerY" id="eLH-LS-Vwj"/>
                     <constraint firstItem="yY6-WX-OcS" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="28" id="fi0-nJ-8jg"/>
+                    <constraint firstItem="AW2-Ki-aud" firstAttribute="trailing" secondItem="P3o-KY-LIT" secondAttribute="trailing" id="hxt-iT-Vua"/>
+                    <constraint firstItem="AW2-Ki-aud" firstAttribute="bottom" secondItem="P3o-KY-LIT" secondAttribute="bottom" id="sWC-ae-JdY"/>
                     <constraint firstItem="SDK-gA-raP" firstAttribute="centerY" secondItem="hQu-ZP-ugr" secondAttribute="centerY" id="seY-SG-N35"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
+                <outlet property="backImageView" destination="P3o-KY-LIT" id="ySC-6s-HgO"/>
                 <outlet property="switchBtn" destination="SDK-gA-raP" id="EzJ-PP-FfH"/>
                 <outlet property="timerLabel" destination="hQu-ZP-ugr" id="vDu-mo-su7"/>
                 <outlet property="titleLabel" destination="yY6-WX-OcS" id="KDa-OR-dyK"/>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
index 4535437..7f6d045 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
@@ -235,12 +235,14 @@ static NSString *cycleTimerflag = @"CycleTimerCell";
             BOOL havePlus = [dataArr containsObject:plusflag];
             if (havePlus && (indexPath.row == dataArr.count-1)) {
                 PlusTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:addCellid forIndexPath:indexPath];
+                cell.backImageView.image = [UIImage imageNamed:@"bottomRound"];
                 cell.addTimerBtn.tag = kBtnTag + indexPath.section;
                 [cell.addTimerBtn addTarget:self action:@selector(addTimer:) forControlEvents:UIControlEventTouchUpInside];
                 return cell;
                 
             }else {
                 SetTimerCell *cell = [tableView dequeueReusableCellWithIdentifier:setTimerflag forIndexPath:indexPath];
+                cell.backImageView.image = [UIImage imageNamed:@"centerrect"];
                 cell.switchBtn.tag = kSwitchBtnTag + indexPath.row;
                 [cell.switchBtn addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventTouchUpInside];
                 XuanduoTimerGroup *group = [dataArr objectAtIndex:havePlus?indexPath.row+1:indexPath.row];
@@ -312,12 +314,14 @@ static NSString *cycleTimerflag = @"CycleTimerCell";
         BOOL havePlus = [dataArr containsObject:plusflag];
         if (havePlus && (indexPath.row == dataArr.count-1)) {
             PlusTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:addCellid forIndexPath:indexPath];
+            cell.backImageView.image = [UIImage imageNamed:@"bottomRound"];
             cell.addTimerBtn.tag = kBtnTag + indexPath.section;
             [cell.addTimerBtn addTarget:self action:@selector(addTimer:) forControlEvents:UIControlEventTouchUpInside];
             return cell;
             
         }else {
             SetTimerCell *cell = [tableView dequeueReusableCellWithIdentifier:setTimerflag forIndexPath:indexPath];
+            cell.backImageView.image = [UIImage imageNamed:@"centerrect"];
             cell.switchBtn.tag = kSwitchBtnTag + indexPath.row;
             [cell.switchBtn addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventTouchUpInside];
             XuanduoTimerGroup *group = [dataArr objectAtIndex:havePlus?indexPath.row+1:indexPath.row];
@@ -384,7 +388,7 @@ static NSString *cycleTimerflag = @"CycleTimerCell";
         height=section==0?50:40;
         UIImageView*imageView=[[UIImageView alloc]init];
         imageView.frame=CGRectMake(0, 0, self.tableView.frame.size.width, height);
-        imageView.image=[UIImage imageNamed:@"set_cellBack"];
+        imageView.image=[UIImage imageNamed:@"topround"];
         UILabel*label=[[UILabel alloc]initWithFrame:CGRectMake(15, 0, self.tableView.frame.size.width-20, height)];
         label.text=_titieArr[section];
         label.textColor=[UIColor blackColor];
@@ -1066,53 +1070,7 @@ static NSString *cycleTimerflag = @"CycleTimerCell";
         BOOL havePlus = [dataArr containsObject:plusflag];
         XuanduoTimerGroup *group = [dataArr objectAtIndex:(havePlus?_indexPath.row+1:_indexPath.row)];
         timerModel.groupNumber = [dataContorl groupNumberTohex:group.groupNumber.integerValue];
-        switch (index) {
-            case 0: //循环泵
-            {
-                timerModel.selectorNumber = @"04";
-                if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
-                {
-                    timerModel.selectorNumber=@"01";
-                }
-            }
-                break;
-            case 1: //增氧
-            {
-                timerModel.selectorNumber = @"01";
-                if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
-                {
-                    timerModel.selectorNumber=@"02";
-                }
-            }
-                break;
-            case 2: //灯光1
-            {
-                timerModel.selectorNumber = @"02";
-                if([self.currentdevice.type isEqualToString:DECICE_TYPE_XUANDUO3F])
-                {
-                    timerModel.selectorNumber=@"03";
-                }
-            }
-                break;
-            case 3: //灯光2
-            {
-                timerModel.selectorNumber = @"03";
-            }
-                break;
-            case 4: //造浪泵
-            {
-                timerModel.selectorNumber = @"06";
-            }
-                break;
-            case 5: //杀菌灯
-            {
-                timerModel.selectorNumber = @"05";
-            }
-                break;
-                
-            default:
-                break;
-        }
+        timerModel.selectorNumber=self.lightNumber;
         NSString*selectorString=[NSString stringWithFormat:@"%@%@%@%@%@%@",timerModel.description,timerModel.selectorNumber,timerModel.groupNumber,timerModel.isOn,timerModel.selectorTime,timerModel.crc16str];
         
         NSData*selctorData=[dataContorl stringToHexData:selectorString];
diff --git a/Ifish/ifishImgSouce/XuToImg/bottomRound.png b/Ifish/ifishImgSouce/XuToImg/bottomRound.png
new file mode 100644
index 0000000000000000000000000000000000000000..45d0e0a08b96286275564f696b617fb3d02f0bb3
GIT binary patch
literal 3697
zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+
zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqv0a|+7
z)5S5Qg7NKL+w7}1rH(y(EGWAr*fGa%VMoG3u|+o`RN@caJFl3Ln7caSh?Tr!O=gqW
zN}ndTBYru~T%H_?MPkY=%*H%V?)^U3d2*_jmEHOJwc2O@oVa&#<II^e>)-x;{Py<t
zYI!5a1_nkZ77hUghlT?ag=fs2%lq!n`-Ed0FhP*)Dki6;r?M@PggP4nJg=MqX@cqw
z5Eal0jXTYW5b|JY@miGD1~;9daaBXW%1=>#Ff9%Z4oV6kLZ-$L+rbJ$SX;cNUN3?=
z2qYxLxNy>nnTl|W92RIPgsj>#O&DSK1P+d=E@yd=oEOTtFzD&lIY@T9IIK{~N&|Zn
zBD#W$W2)Brr$~0IFgd9P8apF7FVta0NTsei!fpjY0j<til1R=Q4H{^$j|L4iRXB{M
z8fb<Y%}~&?WVEb-7PF0`#W1vj9Ic_CmGi(>-ia%6^7F&{Q<2*??G6fj?FJ!cW@dbi
zv$PQn8ifGSj>C#PQ_r3~`>Iw4sa5bmfaAzRfwoh(ZrxH0C}u@z9TZx$Ec^s)X<^Z!
z5W;sb{JtonO(GM}_?K_0e*8X}0M6q|h*rmg10eJ3+*4CiRsT6Av$LIbL}(Jw;Oa?{
zcsRjUfoJO4wQH|lz4~V2G9+mWE+%D3H;WW=UguPsoWw-M>Lr>;F6?VMpmK6T`>EOH
z`DJBgeNF4Fg%Ay^4dIP~+{%*QthWAs|2ZHsK0ZDs=1%MrVI=(=Z@79QBu;MleSB}-
zr1n!4m;U_u6F2|)eWd1Dfe4FQPiv=BYGtKmo%sL2AGdZW!`o_&i!}|55|12GDW9(q
za;!OiPle&h$7hk;Q1FB0*|TSAd#)^5`03%{cF%iC#t&ciA{&2!#Z5s+SJ$^<l_$`P
z|6X2RZeRCj#s`^WNR3eo7A9q0HwB-%iJC2-czS%izy9AJ%b%G!2;Vw9_%13DXmBZk
z<<OIGi@J}Gj-K3J^Z#FMaq;JCYojNx-_(fIp1dFO;O6G^^>KS=oqD)jSnILIe7o9R
z1rHBBJw1JSk&ZV~1pL^`61T7B=bxXSGv`)v>HocDdup<}zg^v*9lzb@Bc-ka7Zx{;
z9+?@BQkQ>|om#l;W7n4N@9)R&E_(~q8f>#D6sf5ylhPQd$uDPf<Hn5{j}(_nYCVpK
zj*ea*zh7?QBh!T7KT46V@Mi3T16)1fHMUh>GImWh(zAXVASr$Pd+5Er)#iLvpP!vg
zKHeuA5x}mDNNx#2jUVg(J-++-ajoX#$)4Z-ynXY<`RVoKW7V(i>;Kg}KQ|ZX{(o<q
z|Ej`ck&$Wt`U5{|HTmW3=3G1f<JW3u?T}-WkDb?%yU%7-{_f6F@9F=3CDbFetq<gD
z8Pt9MQxSaX`uh0l=k{jC#+PsZ%l_OeZT{~5e*1eV_v<G7Me=b7YgkwqFd<BvHf@!^
z<mvCqA$4~j{`&g*`@6flYkz<H`1ttk?VIK!MUW=fn>TNC^z_c1Kd-N^?_c=Ve$B1@
z0Y6JSjMLAZId=}||L?D^u2%P(^P_$8Pk$tv{?xN>+rB+KJX~B%>{#~RYuB%T|7`GE
zR%>_p@5lZ2$GQ)$i`n^UzP<gqdA8NBuB^Pg+<*1-SS6&GykXvWQRT7v_q@Ekb!*qw
t{{H;<^mP5lt#OaVC%m~W`R}{qf7a$~{dosF3Ri%-d!DX-F6*2UngAC77-;|i

literal 0
HcmV?d00001

diff --git a/Ifish/ifishImgSouce/XuToImg/centerrect.png b/Ifish/ifishImgSouce/XuToImg/centerrect.png
new file mode 100644
index 0000000000000000000000000000000000000000..245d1ad11a84d2db70dfb2a392036b0b7a7964b4
GIT binary patch
literal 2994
zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+
zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqvVPN2v
z@pN$vsbGA2eIxH-0|6Gt+j9e3SDRg5z^Zr2U_ZOX&ARiJ^Pj)p_x`yuHxmnofPzB<
z10xeloO(fQ_>a%}IX-Y9Aj3dZKr1-zI44XMhkyo?)6x|;5&TglpwJr)7jPhqCWg_(
z04+~O3lB)SI$AP}mJFlS=V+T@v@Hd0W)5s|_=9=1E-N!j!AxOLd)d>~&t;ucLK6W0
C&rOQ}

literal 0
HcmV?d00001

diff --git a/Ifish/ifishImgSouce/XuToImg/topround.png b/Ifish/ifishImgSouce/XuToImg/topround.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0cbc9b923ad9bc8502676559b638f963c3e4ea8
GIT binary patch
literal 3640
zcmeAS@N?(olHy`uVBq!ia0y~yV6gzQ7jQ5E$uth{r$CCaILO_JVcj{Imq3n7YJ_K+
zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DLx17BIuu3=2RCpLbqv0b07q
z)5S5Qg7NL${aI5gC0HNyI`eQgDYo8N5}+b+M5C$6mCH9>f8$lRJq#N^vgPEweY2N+
ztqZrcs0hpIqhV{5lurHIupw@r{pY7=elOW{qo(-Y^N2T!GYend+M4~}=i}B*n~MJZ
z`MGxO+OziY($dnaSFg^_&OUwmbnuanvsgF;6dW2D7@1hSxc~h5`T4<v2fx3+kKbSS
z_xt(l%l+ry+h70x@$r7om}$>!LatrE{{7pxvhwon+qdUV^3?ji2%-Joa))SrdHcGW
zpP!y~i|g;J{r$~;fA)m`Id#sd>FMe9_5V*z)!uwFXTl3PC$N2Bix1SW)cyVS_1W3k
z>F4L|t^S^8x89<EVbRA&M{jS>-yZ*E)_KpkR*>r;&TO2>a!bG2w)WSTx3{+|+x~x_
zd|X!R?OgTm@9t*rfBp6Q*FTL&ic1>5%}(&2XOsCpP4fMOn=6BtyH!>F)?I(RUw*!A
zb=i{V)jDvK8JQ+?%(1Keb*xu<zJ2|_Pft&KFdmcAGS9zP^WlNx?~L^mi%?VxbII6N
zefjnE_1oY>b~Qf?+<G3id;Qi~4-CBfyGpY&Gc$XR%=1L@Xre&I|HJjbz?rP>zwP_Y
z|Ns70-|%4Op9&0I`>HQ5UR_;%c-a>dm`8!`;#+=Trg6Gn>@JWkiT{sIRRmfP=@qT{
z{M=mYIZZ)=(0Buej6vIhPGR+1>3{6%|J59rznaG~<W_#o&&X2}N2}G~UTk#MyRgmc
zch%QdR|72BrM2GP{rt98)A{Hp86;abvD|v!AS)xo^Yz{@<z|`tcAY=o-QC@6bIKW>
zP&foQL^BpI@NITH#BUICYyYbsA08f7c4w=&qM%;M0k;kmqFVwlEOV6R_#0o_P<rv-
z+n>qD`@Z%+;zXnxjwRe%GB2<>{n!4*H<epl@6Fq{U(Y{8R-n`7AkC4h_GQn~_W?VL
zpZlF>**6y{j#-6Y*b7(jPMte<?zhU5+-a|nJyXTCW#)xrPV?KpNNN54{kt~q_IDvf
zsBKumWP9A{`@&88_Ss!=@7K*Tf2Rb=3P7(0ge~Z8HIuZOf4_FcmhC6bq-{Q@|3;b<
zmRUFiA`%+S#D3Mh2?H9id-v`GYy6bqnjID_cbI?jLg9)vYu4oC=YK!*_BNVM$y)_4
z$`Xz*ymasA{ylr{yj86gM+!JmmRl(={%9VQZ9jGGS{Q4jIg+a{xG(rz@WLX*%-sC<
zk*|A^f-*$lg^di)RIYm4J09?ammt+x$v?HXw>OjT>nbG0PdG~C_+;xBZQ8YKR<p7u
zlI54dGVP~s-MVGcUKNUzHi}rR_}lxOkERPh|8sZ36nHEgNMV}W?tFZq(anW%GvJ~O
zjZ92!UX7FHA{?XOdmz9w+b0fTCMyfiR3=sHiEv#Gvl<pox;A4E!l_&w5?ZWYWlC@-
zHkvRxtFASyL<FgbfI$e?ls7I2b2EWfM<stkgqwy!!U_?Mo1F-AF9EIIa_osJJk|mn
z4g_chY!XJ8yM$9hE3@~cH#{^KG&C#>T9BfSFxNxaAmozN<mm_xFfuwXbvWs#0ylSp
zTEdDYrfT{K4~zy3IHpDe23)2(jHVcH))>u7;KFINjDZxlqlGWHkQ}X*AQkC=R@eU-
YH!NIg7cXw~4Ag7$boFyt=akR{06dK$nE(I)

literal 0
HcmV?d00001