From 83dcb19ea8481a8ae38ef75359dadbf0bf61d3b3 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 01 二月 2021 18:20:25 +0800 Subject: [PATCH] 2021-02-01 1.更新 --- HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 114 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 56 insertions(+), 58 deletions(-) diff --git a/HDL-ON_iOS/EZ/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard similarity index 94% rename from HDL-ON_iOS/EZ/AddDevice.storyboard rename to HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard index febe321..bf1eb84 100644 --- a/HDL-ON_iOS/EZ/AddDevice.storyboard +++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> @@ -14,7 +12,7 @@ <objects> <navigationController id="1Qq-y9-5Vr" sceneMemberID="viewController"> <navigationBar key="navigationBar" contentMode="scaleToFill" id="HjS-88-zNd"> - <rect key="frame" x="0.0" y="20" width="375" height="44"/> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <connections> @@ -38,7 +36,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j2X-TO-2vj" customClass="EZQRView"> - <rect key="frame" x="0.0" y="64" width="375" height="603"/> + <rect key="frame" x="0.0" y="44" width="375" height="623"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qr_scan_line" translatesAutoresizingMaskIntoConstraints="NO" id="i1a-Yx-mmW"> <rect key="frame" x="77.5" y="150" width="220" height="6"/> @@ -47,8 +45,8 @@ <constraint firstAttribute="width" constant="220" id="z1o-th-eJT"/> </constraints> </imageView> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SAq-8X-VZA"> - <rect key="frame" x="22" y="546" width="64" height="30"/> + <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SAq-8X-VZA"> + <rect key="frame" x="22" y="566" width="64" height="30"/> <constraints> <constraint firstAttribute="width" constant="64" id="0id-Ux-Cgq"/> <constraint firstAttribute="height" constant="30" id="qZz-ZY-D4V"/> @@ -61,7 +59,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="璁惧浜岀淮鐮�" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jzO-DN-MQp"> - <rect key="frame" x="87.5" y="389" width="200" height="21"/> + <rect key="frame" x="87.5" y="409" width="200" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="QXL-HS-ZT7"/> <constraint firstAttribute="width" constant="200" id="ezZ-9o-YbC"/> @@ -138,7 +136,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="璁惧鏈鸿韩涓婄殑9浣嶅簭鍒楀彿" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="bPa-tw-WRa"> - <rect key="frame" x="0.0" y="104" width="375" height="40"/> + <rect key="frame" x="0.0" y="84" width="375" height="40"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="40" id="vLh-9U-8RO"/> @@ -150,7 +148,7 @@ </connections> </textField> <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hA9-0Y-3Qf"> - <rect key="frame" x="45" y="250" width="285" height="39"/> + <rect key="frame" x="45" y="230" width="285" height="39"/> <constraints> <constraint firstAttribute="width" constant="285" id="3Bl-Kc-5H6"/> <constraint firstAttribute="height" constant="39" id="Qay-ur-1py"/> @@ -162,7 +160,7 @@ </connections> </button> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="楠岃瘉鐮�" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="j8t-kq-eaK"> - <rect key="frame" x="0.0" y="170" width="375" height="40"/> + <rect key="frame" x="0.0" y="150" width="375" height="40"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="40" id="DjM-dg-5en"/> @@ -211,21 +209,21 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="results_pic_bg" translatesAutoresizingMaskIntoConstraints="NO" id="ceg-ex-Xdb"> - <rect key="frame" x="100" y="99" width="175" height="165"/> + <rect key="frame" x="100" y="79" width="175" height="165"/> <constraints> <constraint firstAttribute="height" constant="165" id="lgW-5o-AFb"/> <constraint firstAttribute="width" constant="175" id="n8A-cf-RRp"/> </constraints> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4Br-8g-Y1F"> - <rect key="frame" x="112.5" y="99" width="150" height="165"/> + <rect key="frame" x="112.5" y="79" width="150" height="165"/> <constraints> <constraint firstAttribute="width" constant="150" id="32c-C2-vw1"/> <constraint firstAttribute="height" constant="165" id="u24-jh-18u"/> </constraints> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qbm-8l-KeG"> - <rect key="frame" x="45" y="352" width="285" height="39"/> + <rect key="frame" x="45" y="332" width="285" height="39"/> <constraints> <constraint firstAttribute="width" constant="285" id="B7i-jI-Zax"/> <constraint firstAttribute="height" constant="39" id="z4C-rd-xpx"/> @@ -237,7 +235,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="灏氭湭杩炴帴缃戠粶" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="8qO-si-Tda"> - <rect key="frame" x="16" y="311" width="343" height="21"/> + <rect key="frame" x="16" y="291" width="343" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="7OY-4Z-9Lv"/> </constraints> @@ -246,7 +244,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="姝e湪鏌ヨ璁惧淇℃伅锛岃绋嶅悗..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="5rP-JO-eZs"> - <rect key="frame" x="16" y="280" width="343" height="24"/> + <rect key="frame" x="16" y="260" width="343" height="24"/> <constraints> <constraint firstAttribute="height" constant="24" id="ymz-86-Y6H"/> </constraints> @@ -255,7 +253,7 @@ <nil key="highlightedColor"/> </label> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="no_wifi" translatesAutoresizingMaskIntoConstraints="NO" id="Zic-gc-gng"> - <rect key="frame" x="140" y="169" width="95" height="95"/> + <rect key="frame" x="140" y="149" width="95" height="95"/> <constraints> <constraint firstAttribute="width" constant="95" id="T7o-O5-WbM"/> <constraint firstAttribute="height" constant="95" id="uiX-rr-64c"/> @@ -309,7 +307,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="BN8-qU-5S9"> - <rect key="frame" x="0.0" y="64" width="375" height="603"/> + <rect key="frame" x="0.0" y="44" width="375" height="623"/> </imageView> </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -354,11 +352,11 @@ <nil key="textColor"/> <nil key="highlightedColor"/> </label> - <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kpi-Vj-qTr"> + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kpi-Vj-qTr"> <rect key="frame" x="172" y="292" width="30" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> </button> - <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NjQ-lz-pW7"> + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NjQ-lz-pW7"> <rect key="frame" x="174" y="353" width="30" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> </button> @@ -391,7 +389,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="0UR-6j-PZR"> - <rect key="frame" x="-4" y="64" width="383" height="603"/> + <rect key="frame" x="-4" y="44" width="383" height="623"/> </imageView> </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -424,11 +422,11 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="clv-dK-n7o"> - <rect key="frame" x="0.0" y="64" width="375" height="603"/> + <rect key="frame" x="0.0" y="44" width="375" height="623"/> <color key="backgroundColor" red="0.92156862745098034" green="0.92156862745098034" blue="0.92156862745098034" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="濡傛灉浣犱娇鐢ㄧ殑鏄弻棰戣矾鐢卞櫒锛岃涓嶈璁╂憚鍍忔満杩炴帴5G棰戞鐨刉i-Fi" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="R5v-Qf-L5p"> - <rect key="frame" x="10" y="72" width="355" height="40"/> + <rect key="frame" x="10" y="52" width="355" height="40"/> <constraints> <constraint firstAttribute="height" constant="40" id="GwT-5d-OBT"/> </constraints> @@ -437,7 +435,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2VJ-jQ-xjR"> - <rect key="frame" x="10" y="122" width="355" height="34"/> + <rect key="frame" x="10" y="102" width="355" height="34"/> <color key="backgroundColor" red="0.92549019610000005" green="0.92549019610000005" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="34" id="jiJ-ow-iwT"/> @@ -447,7 +445,7 @@ <textInputTraits key="textInputTraits"/> </textField> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="O9a-PX-Ekn"> - <rect key="frame" x="10" y="168" width="355" height="34"/> + <rect key="frame" x="10" y="148" width="355" height="34"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="34" id="FPO-BB-N1L"/> @@ -456,7 +454,7 @@ <textInputTraits key="textInputTraits" secureTextEntry="YES"/> </textField> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="x6F-l5-dhJ"> - <rect key="frame" x="45" y="218" width="285" height="38"/> + <rect key="frame" x="45" y="198" width="285" height="38"/> <constraints> <constraint firstAttribute="height" constant="38" id="PA7-yu-iCr"/> <constraint firstAttribute="width" constant="285" id="tA7-YC-H4g"/> @@ -532,8 +530,8 @@ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="hOV-zC-2w5"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> </imageView> - <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iaq-GW-DZt"> - <rect key="frame" x="127" y="203" width="121" height="30"/> + <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iaq-GW-DZt"> + <rect key="frame" x="127" y="183" width="121" height="30"/> <color key="backgroundColor" red="1" green="0.57637232540000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="121" id="bqT-5I-Fd7"/> @@ -547,7 +545,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="璇烽�氳繃涓嬪垪姝ラ灏嗘墜鏈鸿繛鎺ュ埌璁惧Wi-Fi锛�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hz9-ZE-6rg"> - <rect key="frame" x="16" y="86" width="343" height="21"/> + <rect key="frame" x="16" y="66" width="343" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="hWx-qJ-D5P"/> </constraints> @@ -556,7 +554,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2fV-EH-7VO"> - <rect key="frame" x="16" y="124" width="20" height="34"/> + <rect key="frame" x="16" y="104" width="20" height="34"/> <constraints> <constraint firstAttribute="width" constant="20" id="X1g-Uc-DV1"/> <constraint firstAttribute="height" constant="34" id="iFC-0F-xx0"/> @@ -566,7 +564,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="寰呰繛鎺ョ殑璁惧Wi-Fi淇℃伅濡備笅锛�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0PQ-gp-JOK"> - <rect key="frame" x="47.5" y="124" width="311.5" height="17"/> + <rect key="frame" x="47.5" y="104" width="311.5" height="17"/> <constraints> <constraint firstAttribute="height" constant="17" id="oTg-hz-sFc"/> </constraints> @@ -575,7 +573,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="鍚嶇О锛�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bzO-cY-bUs"> - <rect key="frame" x="47.5" y="145" width="43" height="21"/> + <rect key="frame" x="47.5" y="125" width="43" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="AlL-68-8AQ"/> <constraint firstAttribute="width" constant="43" id="N5T-re-TCl"/> @@ -585,7 +583,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="瀵嗙爜锛�" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BBf-mw-P8e"> - <rect key="frame" x="47.5" y="170" width="43" height="21"/> + <rect key="frame" x="47.5" y="150" width="43" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="s8K-RM-Tg7"/> </constraints> @@ -594,7 +592,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EZVIZ_137897687" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SOG-Vj-m3m"> - <rect key="frame" x="99.5" y="145" width="259.5" height="21"/> + <rect key="frame" x="99.5" y="125" width="259.5" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="nXt-eu-vGR"/> </constraints> @@ -603,7 +601,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EZVIZ_137897687" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gzp-iy-iES"> - <rect key="frame" x="99.5" y="170" width="259.5" height="21"/> + <rect key="frame" x="99.5" y="150" width="259.5" height="21"/> <constraints> <constraint firstAttribute="height" constant="21" id="0Gv-BZ-q14"/> </constraints> @@ -612,14 +610,14 @@ <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ehD-Vr-EwS"> - <rect key="frame" x="16" y="245" width="343" height="1"/> + <rect key="frame" x="16" y="225" width="343" height="1"/> <color key="backgroundColor" red="0.78894352791878175" green="0.78894352791878175" blue="0.78894352791878175" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="pik-Wt-Z4d"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SyB-zd-gzt"> - <rect key="frame" x="16" y="261" width="20" height="34"/> + <rect key="frame" x="16" y="241" width="20" height="34"/> <constraints> <constraint firstAttribute="height" constant="34" id="NdV-0A-du0"/> </constraints> @@ -628,12 +626,12 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UGZ-ag-Osr"> - <rect key="frame" x="47.5" y="261" width="311.5" height="60"/> + <rect key="frame" x="47.5" y="241" width="311.5" height="60"/> <attributedString key="attributedText"> <fragment content="杩涘叆鎵嬫満绯荤粺Wi-Fi璁剧疆鐣岄潰锛岄�夋嫨鍚嶇О涓�"> <attributes> <color key="NSBackgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> - <font key="NSFont" size="14" name=".PingFangSC-Regular"/> + <font key="NSFont" metaFont="system" size="14"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/> </attributes> </fragment> @@ -641,22 +639,22 @@ <attributes> <color key="NSBackgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> <color key="NSColor" red="1" green="0.59549855620779035" blue="0.15890927166137003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <font key="NSFont" size="14" name=".PingFangSC-Regular"/> + <font key="NSFont" metaFont="system" size="14"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/> </attributes> </fragment> <fragment content="鐨勭綉缁滐紝鐢ㄦ彁绀虹殑瀵嗙爜杩涜杩炴帴"> <attributes> <color key="NSBackgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/> - <font key="NSFont" size="14" name=".PingFangSC-Regular"/> + <font key="NSFont" metaFont="system" size="14"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/> </attributes> </fragment> </attributedString> <nil key="highlightedColor"/> </label> - <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hOb-L4-rkc"> - <rect key="frame" x="127" y="331" width="121" height="30"/> + <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hOb-L4-rkc"> + <rect key="frame" x="127" y="311" width="121" height="30"/> <color key="backgroundColor" red="1" green="0.57637232540000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="121" id="bBU-c1-yuI"/> @@ -670,24 +668,24 @@ </connections> </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wq1-Ch-GSx"> - <rect key="frame" x="16" y="373" width="343" height="1"/> + <rect key="frame" x="16" y="353" width="343" height="1"/> <color key="backgroundColor" red="0.7889435279" green="0.7889435279" blue="0.7889435279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="fT8-Cd-qEF"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="utk-BE-uLK"> - <rect key="frame" x="16" y="382" width="20" height="35"/> + <rect key="frame" x="16" y="362" width="20" height="35"/> <fontDescription key="fontDescription" type="system" pointSize="29"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q0X-wy-A5B"> - <rect key="frame" x="47.5" y="382" width="311.5" height="40"/> + <rect key="frame" x="47.5" y="362" width="311.5" height="40"/> <attributedString key="attributedText"> <fragment content="杩斿洖demo锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��"> <attributes> - <font key="NSFont" size="14" name=".PingFangSC-Regular"/> + <font key="NSFont" metaFont="system" size="14"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/> </attributes> </fragment> @@ -701,7 +699,7 @@ <constraint firstAttribute="width" constant="20" id="sJq-xn-rP3"/> </constraints> </activityIndicatorView> - <button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b2S-tK-xqv"> + <button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b2S-tK-xqv"> <rect key="frame" x="127" y="617" width="121" height="30"/> <color key="backgroundColor" red="1" green="0.57637232540000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> @@ -812,7 +810,7 @@ <constraint firstAttribute="width" constant="160" id="Wu8-1n-7EF"/> </constraints> </imageView> - <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mDU-NX-CXb"> + <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mDU-NX-CXb"> <rect key="frame" x="162.5" y="392.5" width="50" height="30"/> <color key="backgroundColor" red="1" green="0.57637232540000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> @@ -826,7 +824,7 @@ <action selector="doneBtnClick:" destination="2Wn-Wh-fVL" eventType="touchUpInside" id="TMv-98-CTR"/> </connections> </button> - <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RaQ-FQ-QZ1"> + <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RaQ-FQ-QZ1"> <rect key="frame" x="162.5" y="318.5" width="50" height="30"/> <color key="backgroundColor" red="1" green="0.57637232540000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> @@ -892,7 +890,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_bg" translatesAutoresizingMaskIntoConstraints="NO" id="2Bp-Jx-oq2"> - <rect key="frame" x="0.0" y="64" width="375" height="603"/> + <rect key="frame" x="0.0" y="44" width="375" height="623"/> <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </imageView> </subviews> @@ -911,6 +909,11 @@ <point key="canvasLocation" x="1071" y="1926"/> </scene> </scenes> + <inferredMetricsTieBreakers> + <segue reference="9TP-S2-hhI"/> + <segue reference="MFl-yy-ZsP"/> + <segue reference="VYk-37-nb6"/> + </inferredMetricsTieBreakers> <resources> <image name="addDevice_success" width="320" height="185"/> <image name="blue_button" width="285" height="39"/> @@ -922,9 +925,4 @@ <image name="results_pic_bg" width="175" height="165"/> <image name="wifi_bg" width="320" height="450"/> </resources> - <inferredMetricsTieBreakers> - <segue reference="9TP-S2-hhI"/> - <segue reference="MFl-yy-ZsP"/> - <segue reference="ikM-Zn-H8f"/> - </inferredMetricsTieBreakers> </document> -- Gitblit v1.8.0