From 801450b27112a06c33f4cd8e7a5d9d753b56a1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= <zhufadong@163.com>
Date: Fri, 25 Aug 2023 23:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=B1=8F=E5=B9=95=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigWifiViewController.xib              | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
index 2958f20..89674a5 100644
--- a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
+++ b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
@@ -29,11 +29,11 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a2I-Bk-68I" userLabel="shuoMingShuBtn">
-                    <rect key="frame" x="288" y="64" width="100" height="40"/>
+                    <rect key="frame" x="215" y="25" width="100" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="Keg-ao-If4"/>
                         <constraint firstAttribute="width" constant="100" id="MZZ-Qp-awh"/>
@@ -46,7 +46,7 @@
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="一键联网" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D54-Zo-SRM" userLabel="connectTypeTitle">
-                    <rect key="frame" x="40" y="109" width="353" height="40"/>
+                    <rect key="frame" x="40" y="30" width="280" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="rFI-Mh-k80"/>
                     </constraints>
@@ -55,20 +55,20 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择路由器WIFI" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6V-cd-toE">
-                    <rect key="frame" x="40" y="159" width="353" height="28"/>
+                    <rect key="frame" x="40" y="80" width="280" height="28"/>
                     <fontDescription key="fontDescription" type="system" pointSize="20"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KU2-2N-7iz" userLabel="LINE1">
-                    <rect key="frame" x="0.0" y="212" width="393" height="1"/>
+                    <rect key="frame" x="0.0" y="123" width="320" height="1"/>
                     <color key="backgroundColor" systemColor="systemGrayColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="Ggw-78-EwX"/>
                     </constraints>
                 </view>
                 <view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GWP-4K-9X8" userLabel="LINE2">
-                    <rect key="frame" x="0.0" y="269" width="393" height="1"/>
+                    <rect key="frame" x="0.0" y="180" width="320" height="1"/>
                     <color key="backgroundColor" systemColor="systemGrayColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="YUb-zQ-H2L"/>
@@ -76,7 +76,7 @@
                     </constraints>
                 </view>
                 <view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="504-kU-hp3" userLabel="LINE3">
-                    <rect key="frame" x="0.0" y="326" width="393" height="1"/>
+                    <rect key="frame" x="0.0" y="237" width="320" height="1"/>
                     <color key="backgroundColor" systemColor="systemGrayColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="B1x-Qm-fkd"/>
@@ -85,7 +85,7 @@
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WIFI:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bau-WU-WAP">
-                    <rect key="frame" x="40" y="213" width="40" height="56"/>
+                    <rect key="frame" x="40" y="124" width="40" height="56"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="40" id="OXx-1w-lyH"/>
                     </constraints>
@@ -94,18 +94,18 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jcI-qI-bgh" userLabel="wifiNamelabel">
-                    <rect key="frame" x="85" y="213" width="303" height="56"/>
+                    <rect key="frame" x="85" y="124" width="230" height="56"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="888888" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="O5l-oe-jwK" userLabel="wifiTextFiled">
-                    <rect key="frame" x="85" y="270" width="303" height="56"/>
+                    <rect key="frame" x="85" y="181" width="230" height="56"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密码:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dv9-sQ-6QZ">
-                    <rect key="frame" x="40" y="270" width="40" height="56"/>
+                    <rect key="frame" x="40" y="181" width="40" height="56"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="40" id="hps-ui-SC7"/>
                     </constraints>
@@ -114,20 +114,20 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5UF-8K-mpU" userLabel="connectTipLbl">
-                    <rect key="frame" x="40" y="357" width="313" height="193.33333333333337"/>
+                    <rect key="frame" x="40" y="268" width="240" height="191"/>
                     <string key="text">1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)
 2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。
 3、如多次尝试一键联网都不成功，可切换其他 联网方式，每次重新连接时插座需断一次电
 然后重新复位连接。</string>
-                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
                     <color key="textColor" systemColor="systemGrayColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6tu-I5-SeJ" userLabel="connectingView">
-                    <rect key="frame" x="0.0" y="149" width="393" height="178"/>
+                    <rect key="frame" x="0.0" y="70" width="320" height="168"/>
                     <subviews>
                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AbO-MC-LqW" userLabel="reasonBtn">
-                            <rect key="frame" x="8" y="128" width="385" height="40"/>
+                            <rect key="frame" x="8" y="118" width="312" height="40"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="N5w-vh-LPP"/>
                             </constraints>
@@ -139,7 +139,7 @@
                             </connections>
                         </button>
                         <view hidden="YES" alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bwm-2j-Hx2" userLabel="LINE4">
-                            <rect key="frame" x="121.66666666666669" y="162" width="150" height="1"/>
+                            <rect key="frame" x="85" y="152" width="150" height="1"/>
                             <color key="backgroundColor" systemColor="systemGrayColor"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="150" id="Cf9-EA-yPv"/>
@@ -147,7 +147,7 @@
                             </constraints>
                         </view>
                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3H1-rG-gP1" userLabel="apBtn">
-                            <rect key="frame" x="106.66666666666669" y="10" width="180" height="40"/>
+                            <rect key="frame" x="70" y="10" width="180" height="40"/>
                             <color key="backgroundColor" red="0.48504191639999999" green="0.74883419279999996" blue="0.75294560190000004" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="B4u-Kt-QEJ"/>
@@ -167,13 +167,13 @@
                             </connections>
                         </button>
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设备连接失败" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mZN-ia-LkX" userLabel="resultLabel">
-                            <rect key="frame" x="0.0" y="77.666666666666657" width="393" height="20.333333333333329"/>
+                            <rect key="frame" x="0.0" y="67.5" width="320" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" systemColor="systemPinkColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="GB5-YX-lPF" userLabel="indicator">
-                            <rect key="frame" x="178" y="70.666666666666657" width="37" height="37"/>
+                            <rect key="frame" x="141.5" y="65.5" width="37" height="37"/>
                         </activityIndicatorView>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -194,7 +194,7 @@
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HuT-1B-gI8" userLabel="connectTypeBtn">
-                    <rect key="frame" x="30" y="658" width="333" height="40"/>
+                    <rect key="frame" x="30" y="433" width="260" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="Qry-ak-u1g"/>
                     </constraints>
@@ -206,11 +206,11 @@
                     </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kvd-IO-pFg" userLabel="connectBtn">
-                    <rect key="frame" x="71.666666666666686" y="728" width="250" height="60"/>
+                    <rect key="frame" x="35" y="488" width="250" height="50"/>
                     <color key="backgroundColor" red="0.17318186159999999" green="0.3044036329" blue="0.60787320140000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="250" id="1dZ-qd-hod"/>
-                        <constraint firstAttribute="height" constant="60" id="9fL-Vd-J5H"/>
+                        <constraint firstAttribute="height" constant="50" id="9fL-Vd-J5H"/>
                     </constraints>
                     <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <state key="normal" title="Button"/>
@@ -261,16 +261,16 @@
                 <constraint firstAttribute="trailing" secondItem="504-kU-hp3" secondAttribute="trailing" id="fzi-UL-BQu"/>
                 <constraint firstItem="HuT-1B-gI8" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="30" id="gHv-9W-CS0"/>
                 <constraint firstItem="D54-Zo-SRM" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="40" id="j1H-26-pFi"/>
-                <constraint firstItem="KU2-2N-7iz" firstAttribute="top" secondItem="d6V-cd-toE" secondAttribute="bottom" constant="25" id="k8R-MO-Htn"/>
+                <constraint firstItem="KU2-2N-7iz" firstAttribute="top" secondItem="d6V-cd-toE" secondAttribute="bottom" constant="15" id="k8R-MO-Htn"/>
                 <constraint firstItem="d6V-cd-toE" firstAttribute="leading" secondItem="D54-Zo-SRM" secondAttribute="leading" id="lPS-VU-u2K"/>
                 <constraint firstAttribute="trailing" secondItem="GWP-4K-9X8" secondAttribute="trailing" id="ngC-CB-fCg"/>
-                <constraint firstItem="D54-Zo-SRM" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="50" id="ns7-Yx-wip"/>
+                <constraint firstItem="D54-Zo-SRM" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="10" id="ns7-Yx-wip"/>
                 <constraint firstItem="KU2-2N-7iz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="obb-p1-4XH"/>
                 <constraint firstItem="504-kU-hp3" firstAttribute="top" secondItem="O5l-oe-jwK" secondAttribute="bottom" id="oyF-cp-igt"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="5UF-8K-mpU" secondAttribute="trailing" constant="40" id="qdx-A1-MzN"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="bottom" constant="30" id="sHh-eQ-MJM"/>
                 <constraint firstItem="bau-WU-WAP" firstAttribute="leading" secondItem="d6V-cd-toE" secondAttribute="leading" id="tSj-er-HwA"/>
-                <constraint firstItem="HuT-1B-gI8" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="top" constant="-30" id="v1E-Ff-HYR"/>
+                <constraint firstItem="HuT-1B-gI8" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="top" constant="-15" id="v1E-Ff-HYR"/>
                 <constraint firstAttribute="trailing" secondItem="a2I-Bk-68I" secondAttribute="trailing" constant="5" id="vDW-Uh-dSJ"/>
                 <constraint firstAttribute="trailing" secondItem="O5l-oe-jwK" secondAttribute="trailing" constant="5" id="vKy-42-AJV"/>
                 <constraint firstItem="Dv9-sQ-6QZ" firstAttribute="leading" secondItem="bau-WU-WAP" secondAttribute="leading" id="vwm-go-uFl"/>
@@ -280,7 +280,7 @@
                     <nil key="value"/>
                 </userDefinedRuntimeAttribute>
             </userDefinedRuntimeAttributes>
-            <point key="canvasLocation" x="25.190839694656489" y="-32.394366197183103"/>
+            <point key="canvasLocation" x="24.375" y="-32.74647887323944"/>
         </view>
     </objects>
     <resources>