From e6ea885b42b7866b1985fa0e947cbe50ae13c270 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 19 十月 2021 13:27:43 +0800
Subject: [PATCH] 2021-10-19 1.更新萤石库，适配CTQ1P无法扫码配网问题；增加SoftAP热点适配处理前缀和提示。
---
DLL/IOS/EZSDK.IOS.dll | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 27 +++++--------
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 77 ++++++++++++++++++++++++++++++++++----
3 files changed, 79 insertions(+), 25 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f02de9b..2f6a5e2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,28 +1,23 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
<Files>
- <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="255" Column="73" />
- <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="18" Column="21" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="323" Column="80" />
- <File FileName="HDL-ON_Android/LeChengVideoActivity.cs" Line="416" Column="23" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="309" Column="42" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
- <Node name="ThirdPartySdk" expanded="True">
- <Node name="ESOnVideo.cs" selected="True" />
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="values-zh" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True" />
</Node>
</Node>
</Node>
@@ -36,7 +31,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index cb145fc..2a4f384 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
index bba85b8..f5af9fc 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -1,8 +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>
- <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>
@@ -683,24 +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="杩斿洖">
<attributes>
- <font key="NSFont" size="14" name=".PingFangSC-Regular"/>
- <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>
- <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="HelveticaNeue"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="20" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
</attributes>
</fragment>
<fragment content="锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��">
<attributes>
- <font key="NSFont" size="14" name=".PingFangSC-Regular"/>
- <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="鈥�">
+ <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>
--
Gitblit v1.8.0