From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
index bf1eb84..f5af9fc 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" 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="17505"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -141,6 +140,7 @@
<constraints>
<constraint firstAttribute="height" constant="40" id="vLh-9U-8RO"/>
</constraints>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="alphabet"/>
<connections>
@@ -165,6 +165,7 @@
<constraints>
<constraint firstAttribute="height" constant="40" id="DjM-dg-5en"/>
</constraints>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" keyboardType="alphabet"/>
<connections>
@@ -450,6 +451,7 @@
<constraints>
<constraint firstAttribute="height" constant="34" id="FPO-BB-N1L"/>
</constraints>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" secureTextEntry="YES"/>
</textField>
@@ -681,12 +683,83 @@
<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="362" width="311.5" height="40"/>
+ <rect key="frame" x="47.5" y="362" width="311.5" height="100"/>
<attributedString key="attributedText">
- <fragment content="杩斿洖demo锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��">
+ <fragment content="杩斿洖">
<attributes>
- <font key="NSFont" metaFont="system" size="14"/>
- <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0"/>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="APP">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鈥�">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="(娉ㄦ剰锛氬鏋滆澶�">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="WIFI">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鍚嶇О涓嶆槸鈥�">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="EZVIZ">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鈥濆墠缂�鐨勶紝璇峰鍒跺瘑鐮佸悗鏍规嵁鏂扮殑鍓嶇紑鍚嶅瓧锛屾墜鍔ㄤ慨鏀瑰瘑鐮佺殑鍓嶇紑骞惰繛鎺ュ嵆鍙�備緥濡傗��">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="SoftAP_XXXXXXX">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="13" name="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
+ </attributes>
+ </fragment>
+ <fragment content="鈥�)">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" size="14" name="PingFangSC-Regular"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
</attributes>
</fragment>
</attributedString>
@@ -911,8 +984,8 @@
</scenes>
<inferredMetricsTieBreakers>
<segue reference="9TP-S2-hhI"/>
- <segue reference="MFl-yy-ZsP"/>
- <segue reference="VYk-37-nb6"/>
+ <segue reference="9Lc-Kx-oZS"/>
+ <segue reference="ikM-Zn-H8f"/>
</inferredMetricsTieBreakers>
<resources>
<image name="addDevice_success" width="320" height="185"/>
--
Gitblit v1.8.0