From e103d0e5edbef4fff40468873a700cb2d823fb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9D=E5=8F=91=E5=86=AC?= <zhufadong@163.com>
Date: Sun, 20 Aug 2023 17:12:30 +0800
Subject: [PATCH] =?UTF-8?q?ap=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigWifiViewController.h                |   7 ++
 .../ConfigWifiViewController.xib              | 108 +++++++++++++++---
 2 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.h b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.h
index 5f6cb0f..7fe35df 100644
--- a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.h
+++ b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.h
@@ -18,6 +18,13 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *wifiNamelabel;
 @property (weak, nonatomic) IBOutlet UITextField *wifiTextFiled;
+@property (weak, nonatomic) IBOutlet UIView *connectingView;
+@property (weak, nonatomic) IBOutlet UIButton *apBtn;
+@property (weak, nonatomic) IBOutlet UIButton *reasonBtn;
+@property (weak, nonatomic) IBOutlet UILabel *resultLabel;
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *indicator;
+
 
 @property (nonatomic, strong) UIView *mask;
 @property (nonatomic, strong) StoreNameView *storeNameView;
diff --git a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
index 11c8a4d..4480a49 100644
--- a/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
+++ b/Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib
@@ -11,10 +11,15 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ConfigWifiViewController">
             <connections>
+                <outlet property="apBtn" destination="3H1-rG-gP1" id="LIM-iV-8YB"/>
                 <outlet property="connectBtn" destination="kvd-IO-pFg" id="9zS-Oh-1HY"/>
                 <outlet property="connectTipLbl" destination="5UF-8K-mpU" id="hRK-s6-f1Q"/>
                 <outlet property="connectTypeBtn" destination="HuT-1B-gI8" id="V75-g5-TD2"/>
                 <outlet property="connectTypeTitle" destination="D54-Zo-SRM" id="Rrc-ji-Mi6"/>
+                <outlet property="connectingView" destination="6tu-I5-SeJ" id="WWP-5J-epi"/>
+                <outlet property="indicator" destination="GB5-YX-lPF" id="6QA-Zj-USC"/>
+                <outlet property="reasonBtn" destination="AbO-MC-LqW" id="ylr-EB-OXe"/>
+                <outlet property="resultLabel" destination="mZN-ia-LkX" id="GbV-Ue-ryI"/>
                 <outlet property="shuoMingShuBtn" destination="a2I-Bk-68I" id="iYV-KF-6No"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="wifiNamelabel" destination="jcI-qI-bgh" id="Pyn-aG-AwP"/>
@@ -26,6 +31,19 @@
             <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
+                <button 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"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="Keg-ao-If4"/>
+                        <constraint firstAttribute="width" constant="100" id="MZZ-Qp-awh"/>
+                    </constraints>
+                    <color key="tintColor" systemColor="labelColor"/>
+                    <state key="normal" title="Button"/>
+                    <buttonConfiguration key="configuration" style="plain" title="联网视频"/>
+                    <connections>
+                        <action selector="shuoMingShuBtnAction:" destination="-1" eventType="touchUpInside" id="GNn-Aq-dIA"/>
+                    </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"/>
                     <constraints>
@@ -104,6 +122,76 @@
                     <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"/>
+                    <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"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="N5w-vh-LPP"/>
+                            </constraints>
+                            <color key="tintColor" systemColor="labelColor"/>
+                            <state key="normal" title="Button"/>
+                            <buttonConfiguration key="configuration" style="plain" title="查看联网失败的原因"/>
+                            <connections>
+                                <action selector="connectTypeClick:" destination="-1" eventType="touchUpInside" id="Pvi-dI-5am"/>
+                            </connections>
+                        </button>
+                        <view 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"/>
+                            <color key="backgroundColor" systemColor="systemGrayColor"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="150" id="Cf9-EA-yPv"/>
+                                <constraint firstAttribute="height" constant="1" id="z0d-Pe-xWT"/>
+                            </constraints>
+                        </view>
+                        <button 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"/>
+                            <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"/>
+                                <constraint firstAttribute="width" constant="180" id="V1W-6p-c2G"/>
+                            </constraints>
+                            <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <state key="normal" title="Button"/>
+                            <buttonConfiguration key="configuration" style="plain" title="连接设备网络"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="5"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="connectTypeClick:" destination="-1" eventType="touchUpInside" id="R7q-Dy-WEB"/>
+                            </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"/>
+                            <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"/>
+                        </activityIndicatorView>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="AbO-MC-LqW" secondAttribute="bottom" constant="10" id="0Hk-tN-feu"/>
+                        <constraint firstItem="GB5-YX-lPF" firstAttribute="centerX" secondItem="6tu-I5-SeJ" secondAttribute="centerX" id="3uw-Op-nyw"/>
+                        <constraint firstAttribute="trailing" secondItem="mZN-ia-LkX" secondAttribute="trailing" id="8xu-i8-OOn"/>
+                        <constraint firstItem="3H1-rG-gP1" firstAttribute="top" secondItem="6tu-I5-SeJ" secondAttribute="top" constant="10" id="Eba-lC-tgc"/>
+                        <constraint firstItem="mZN-ia-LkX" firstAttribute="leading" secondItem="6tu-I5-SeJ" secondAttribute="leading" id="Lfw-jN-kgs"/>
+                        <constraint firstItem="GB5-YX-lPF" firstAttribute="centerY" secondItem="6tu-I5-SeJ" secondAttribute="centerY" id="YhC-Nf-3M5"/>
+                        <constraint firstAttribute="trailing" secondItem="AbO-MC-LqW" secondAttribute="trailing" id="hI6-Hm-C9W"/>
+                        <constraint firstItem="mZN-ia-LkX" firstAttribute="centerX" secondItem="6tu-I5-SeJ" secondAttribute="centerX" id="jgT-L3-pKo"/>
+                        <constraint firstItem="3H1-rG-gP1" firstAttribute="centerX" secondItem="6tu-I5-SeJ" secondAttribute="centerX" id="ku2-oN-kIO"/>
+                        <constraint firstItem="Bwm-2j-Hx2" firstAttribute="centerX" secondItem="6tu-I5-SeJ" secondAttribute="centerX" id="o25-sF-LJu"/>
+                        <constraint firstItem="AbO-MC-LqW" firstAttribute="top" secondItem="mZN-ia-LkX" secondAttribute="bottom" constant="30" id="r33-ne-5Xs"/>
+                        <constraint firstItem="AbO-MC-LqW" firstAttribute="leading" secondItem="6tu-I5-SeJ" secondAttribute="leading" constant="8" id="x8Q-Bc-vdi"/>
+                        <constraint firstItem="Bwm-2j-Hx2" firstAttribute="bottom" secondItem="AbO-MC-LqW" secondAttribute="bottom" constant="-5" id="yRb-Zg-bWU"/>
+                    </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"/>
                     <constraints>
@@ -136,19 +224,6 @@
                         <action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="h8y-wU-RjA"/>
                     </connections>
                 </button>
-                <button 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"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="40" id="Keg-ao-If4"/>
-                        <constraint firstAttribute="width" constant="100" id="MZZ-Qp-awh"/>
-                    </constraints>
-                    <color key="tintColor" systemColor="labelColor"/>
-                    <state key="normal" title="Button"/>
-                    <buttonConfiguration key="configuration" style="plain" title="联网视频"/>
-                    <connections>
-                        <action selector="shuoMingShuBtnAction:" destination="-1" eventType="touchUpInside" id="GNn-Aq-dIA"/>
-                    </connections>
-                </button>
             </subviews>
             <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -159,6 +234,8 @@
                 <constraint firstItem="O5l-oe-jwK" firstAttribute="leading" secondItem="bau-WU-WAP" secondAttribute="trailing" constant="5" id="4hQ-cG-kYJ"/>
                 <constraint firstItem="jcI-qI-bgh" firstAttribute="leading" secondItem="bau-WU-WAP" secondAttribute="trailing" constant="5" id="6Go-zM-V5I"/>
                 <constraint firstItem="504-kU-hp3" firstAttribute="top" secondItem="Dv9-sQ-6QZ" secondAttribute="bottom" id="6RC-ho-4Dn"/>
+                <constraint firstItem="6tu-I5-SeJ" firstAttribute="top" secondItem="D54-Zo-SRM" secondAttribute="bottom" id="7fE-5b-gdF"/>
+                <constraint firstItem="504-kU-hp3" firstAttribute="bottom" secondItem="6tu-I5-SeJ" secondAttribute="bottom" id="8Ot-0z-ZAn"/>
                 <constraint firstItem="5UF-8K-mpU" firstAttribute="leading" secondItem="D54-Zo-SRM" secondAttribute="leading" id="9R4-5o-lSr"/>
                 <constraint firstItem="GWP-4K-9X8" firstAttribute="top" secondItem="KU2-2N-7iz" secondAttribute="bottom" constant="56" id="Bq7-hp-6Lo"/>
                 <constraint firstItem="a2I-Bk-68I" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="5" id="Cyr-QV-PxZ"/>
@@ -172,7 +249,9 @@
                 <constraint firstItem="GWP-4K-9X8" firstAttribute="top" secondItem="jcI-qI-bgh" secondAttribute="bottom" id="PMc-8l-dZ5"/>
                 <constraint firstAttribute="trailing" secondItem="KU2-2N-7iz" secondAttribute="trailing" id="ScV-Mc-DSL"/>
                 <constraint firstItem="d6V-cd-toE" firstAttribute="top" secondItem="D54-Zo-SRM" secondAttribute="bottom" constant="10" id="T0l-Go-Skc"/>
+                <constraint firstItem="6tu-I5-SeJ" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="Ux6-SR-njg"/>
                 <constraint firstItem="d6V-cd-toE" firstAttribute="height" secondItem="D54-Zo-SRM" secondAttribute="height" multiplier="0.7" id="Wza-N7-ID2"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="6tu-I5-SeJ" secondAttribute="trailing" id="aq4-1b-rjL"/>
                 <constraint firstItem="d6V-cd-toE" firstAttribute="width" secondItem="D54-Zo-SRM" secondAttribute="width" id="b3I-hV-c0S"/>
                 <constraint firstItem="5UF-8K-mpU" firstAttribute="top" secondItem="504-kU-hp3" secondAttribute="bottom" constant="30" id="bOQ-i7-FhX"/>
                 <constraint firstItem="504-kU-hp3" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="dNE-rL-Cpm"/>
@@ -213,5 +292,8 @@
         <systemColor name="systemGrayColor">
             <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
+        <systemColor name="systemPinkColor">
+            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>