From 32bd4f90fb1d404ec80c3a4f2668eb658c1fb3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= <zhufadong@163.com>
Date: Tue, 26 Jul 2022 18:49:51 +0800
Subject: [PATCH] =?UTF-8?q?UI=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CenterontrolControllers/XuTo/CycleTimerCell.xib   | 11 +++++++++++
 .../CenterontrolControllers/XuTo/SetTimerCell.xib     | 11 +++++------
 .../XuTo/XuanduoTimerSettingViewController.m          |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/CycleTimerCell.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/CycleTimerCell.xib
index 614e036..9956e4a 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/CycleTimerCell.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/CycleTimerCell.xib
@@ -17,6 +17,14 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rbr-cd-RjK" userLabel="lineView">
+                        <rect key="frame" x="5" y="0.0" width="310" height="0.5"/>
+                        <viewLayoutGuide key="safeArea" id="Xby-yS-NPo"/>
+                        <color key="backgroundColor" red="0.25490196079999999" green="0.25490196079999999" blue="0.25490196079999999" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="dvy-TL-2YZ"/>
+                        </constraints>
+                    </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开启:00:00:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V4x-oE-ip3">
                         <rect key="frame" x="5" y="12" width="120" height="20"/>
                         <constraints>
@@ -49,7 +57,10 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="V4x-oE-ip3" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="1Qt-gz-Pid"/>
+                    <constraint firstItem="rbr-cd-RjK" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="2NS-7d-nRB"/>
                     <constraint firstAttribute="trailing" secondItem="x3i-Y3-Wrg" secondAttribute="trailing" constant="28" id="8Cu-wz-Hqn"/>
+                    <constraint firstItem="rbr-cd-RjK" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="5" id="D9Y-99-5mC"/>
+                    <constraint firstAttribute="trailing" secondItem="rbr-cd-RjK" secondAttribute="trailing" constant="5" id="IU9-av-Haj"/>
                     <constraint firstItem="x3i-Y3-Wrg" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="U7B-wg-Zpz"/>
                     <constraint firstItem="V4x-oE-ip3" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="5" id="b8c-bF-gws"/>
                     <constraint firstItem="xa5-yA-Py3" firstAttribute="trailing" secondItem="x3i-Y3-Wrg" secondAttribute="leading" constant="-20" id="hSU-AU-WOF"/>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib
index 3425676..33cf93c 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/SetTimerCell.xib
@@ -20,15 +20,15 @@
                     <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"/>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AW2-Ki-aud" userLabel="lineView">
+                        <rect key="frame" x="5" y="49.5" width="310" 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>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jbr-On-zhz" userLabel="topLineView">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="0.5"/>
+                        <rect key="frame" x="5" y="0.0" width="310" height="0.5"/>
                         <color key="backgroundColor" red="0.25490196079999999" green="0.25490196079999999" blue="0.25490196079999999" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="0.5" id="PD2-gV-8yB"/>
@@ -62,20 +62,19 @@
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="P3o-KY-LIT" secondAttribute="trailing" id="2yN-ro-gmU"/>
                     <constraint firstItem="Jbr-On-zhz" firstAttribute="height" secondItem="AW2-Ki-aud" secondAttribute="height" id="4uV-xP-3ug"/>
-                    <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="Jbr-On-zhz" firstAttribute="leading" secondItem="AW2-Ki-aud" secondAttribute="leading" id="Aiu-4T-JEl"/>
                     <constraint firstItem="Jbr-On-zhz" firstAttribute="width" secondItem="AW2-Ki-aud" secondAttribute="width" id="AqR-MT-7f9"/>
                     <constraint firstItem="Jbr-On-zhz" firstAttribute="trailing" secondItem="AW2-Ki-aud" secondAttribute="trailing" id="EOu-lL-2eq"/>
-                    <constraint firstItem="AW2-Ki-aud" firstAttribute="leading" secondItem="P3o-KY-LIT" secondAttribute="leading" id="KEg-pL-yYb"/>
+                    <constraint firstItem="AW2-Ki-aud" firstAttribute="leading" secondItem="P3o-KY-LIT" secondAttribute="leading" constant="5" 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="trailing" secondItem="P3o-KY-LIT" secondAttribute="trailing" constant="-5" id="hxt-iT-Vua"/>
                     <constraint firstItem="AW2-Ki-aud" firstAttribute="bottom" secondItem="P3o-KY-LIT" secondAttribute="bottom" id="sWC-ae-JdY"/>
                     <constraint firstItem="Jbr-On-zhz" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="sdy-S2-xv4"/>
                     <constraint firstItem="SDK-gA-raP" firstAttribute="centerY" secondItem="hQu-ZP-ugr" secondAttribute="centerY" id="seY-SG-N35"/>
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
index 7f6d045..44b7f15 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/XuanduoTimerSettingViewController.m
@@ -279,7 +279,7 @@ static NSString *cycleTimerflag = @"CycleTimerCell";
         BOOL havePlus = [dataArr containsObject:plusflag];
         {
             CycleTimerCell *cell = [tableView dequeueReusableCellWithIdentifier:cycleTimerflag forIndexPath:indexPath];
-            cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"set_cellBack"]];
+            cell.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bottomRound"]];
             [cell.switchBtn setImage:[UIImage imageNamed:@"graybtn_big.png"] forState:UIControlStateNormal];
             [cell.switchBtn setImage:[UIImage imageNamed:@"greenbtn_big"] forState:UIControlStateSelected];
             [cell.switchBtn addTarget:self action:@selector(cycleModeAction:) forControlEvents:UIControlEventTouchUpInside];