From f793bebc36df45101c465efaed136c3309a19f46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 06 四月 2023 10:57:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
SiriIntents/SiriIntents.csproj | 1
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 5 ++
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 4 ++
HDL-ON_iOS/HDL-ON_iOS.csproj | 1
HDL_ON/Common/ApiUtlis.cs | 17 +++++---
DLL/IOS/EZSDK.IOS.dll | 0
HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard | 9 ++++
HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings | 20 ++++++++++
HDL-ON_iOS/Info.plist | 8 ++--
HDL-ON_iOS/Resources/en.lproj/Localizable.strings | 20 ++++++++++
HDL_ON/DAL/Server/HttpServerRequest.cs | 2
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | 12 +++++-
SiriIntentsUI/SiriIntentsUI.csproj | 1
SiriIntents/Server/HttpUtil.cs | 4 +-
14 files changed, 84 insertions(+), 20 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 88f3252..e3d368f 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index dc772e4..5cda6b8 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -59,7 +59,6 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro230308-3-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index a76be6f..aa051fd 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.6.602303293</string>
+ <string>1.6.602303301</string>
<key>CFBundleVersion</key>
- <string>1.6.603293</string>
+ <string>1.6.603301</string>
<key>NSAppleMusicUsageDescription</key>
<string>App needs to access your music library to connect to an external player to play music.</string>
<key>NSLocationAlwaysUsageDescription</key>
@@ -142,7 +142,7 @@
<string>LC Video will be use</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>LC Video will be use</string>
- <key>Custom Property</key>
- <string></string>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string>EZ video will be use</string>
</dict>
</plist>
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
index d802080..935b43a 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -844,8 +844,15 @@
<navigationItem key="navigationItem" id="XkN-Um-DoE"/>
<connections>
<outlet property="addBtn" destination="b2S-tK-xqv" id="9pR-up-3TG"/>
+ <outlet property="nameL" destination="bzO-cY-bUs" id="aYK-OL-VpJ"/>
+ <outlet property="passwordLable" destination="BBf-mw-P8e" id="d3L-jP-uP1"/>
<outlet property="processingIndicator" destination="YrL-E6-3kA" id="uPy-Af-flm"/>
+ <outlet property="step1TipLable" destination="0PQ-gp-JOK" id="nAm-9N-DTh"/>
+ <outlet property="stepThreeLable" destination="Q0X-wy-A5B" id="DWX-OJ-YK3"/>
<outlet property="stepTwoLabel" destination="UGZ-ag-Osr" id="9F4-Kd-6rm"/>
+ <outlet property="tipLable" destination="hz9-ZE-6rg" id="ptX-eG-7O7"/>
+ <outlet property="toCopBtn" destination="iaq-GW-DZt" id="TnC-6F-kLV"/>
+ <outlet property="toSetBtn" destination="hOb-L4-rkc" id="cYH-M0-bkA"/>
<outlet property="wifiNameLabel" destination="SOG-Vj-m3m" id="uq7-f2-ZQ8"/>
<outlet property="wifiPwdLabel" destination="gzp-iy-iES" id="Z9H-tO-3B5"/>
<segue destination="2Wn-Wh-fVL" kind="push" identifier="go2WifiConfigResult" id="Csk-KC-bfz"/>
@@ -986,7 +993,7 @@
<inferredMetricsTieBreakers>
<segue reference="9TP-S2-hhI"/>
<segue reference="Lmt-j9-vhw"/>
- <segue reference="VYk-37-nb6"/>
+ <segue reference="ikM-Zn-H8f"/>
</inferredMetricsTieBreakers>
<resources>
<image name="addDevice_success" width="320" height="185"/>
diff --git a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
index 38bbd2b..ac1100f 100644
--- a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -66,6 +66,7 @@
"device_password"="Password";
"device_account_pw_empty"="The user name or password is required.";
"device_lan_preview_title"="Live View via LAN";
+"device_add_device_qr_code"="Device QR Code";
"device_open"="Open";
"device_open_success"="Success to open the door!";
@@ -164,6 +165,25 @@
"wifi_device_start_ready"="The device is already started and it is the first time to configure with network.";
"wifi_config_wifi_ago"="This device is configured with network before.";
+"wifi_config_seria_num"="9-digit serial number on the device body";
+"wifi_config_verify_code"="Verification Code";
+"wifi_config_connected"="Connected";
+"wifi_config_select_set_param"="Select \"Set Parameters\"";
+"wifi_config_select_wifi"="Select \"Wi Fi\"";
+"wifi_config_net_work"="Configure Network";
+"wifi_config_name"="Name:";
+"wifi_config_copy_pwd"="Copy Pwd";
+"wifi_config_to_setting"="To Setting";
+"wifi_config_step_three"="Return to the app, wait for the device to connect, and automatically proceed to the next step after success.";
+"wifi_config_tip"="Please connect your phone to your device Wi Fi by following these steps:";
+"wifi_config_step_three_tip"="(Note: If the device WIFI name is not prefixed with \"EZVIZ\", please copy the password and manually modify the password prefix based on the new prefix name and connect. For example, \"SoftAP_XXXXXXX\")";
+"wifi_config_not_connected"="Not connected";
+"wifi_config_step_2_tips"="The Wi Fi information of the devices to be connected is as follows:";
+"wifi_config_step_2_tips"="If you are using a dual frequency router, please do not connect the camera to Wi Fi in the 5G frequency band";
+"wifi_config_step_2_next_step"="Next Step";
+"wifi_config_step_2_net"="Net:";
+"wifi_config_step_2_password"="Pwd:";
+
"ui_last_update"="Last Updated:";
"ui_last_update_empty"="Last Updated: No record.";
"ui_just_now"="Recently";
diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
index 947e7bb..d2711a4 100644
--- a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -66,6 +66,7 @@
"device_password"="瀵嗙爜";
"device_account_pw_empty"="甯愬彿鎴栧瘑鐮佷笉鑳戒负绌�";
"device_lan_preview_title"="灞�鍩熺綉棰勮";
+"device_add_device_qr_code"="璁惧浜岀淮鐮�";
"device_open"="寮�闂�";
"device_open_success"="寮�闂ㄦ垚鍔燂紒";
@@ -165,6 +166,25 @@
"wifi_device_start_ready"="璁惧宸插惎鍔ㄥソ锛屼笖鏄涓�娆￠厤缃綉缁�";
"wifi_config_wifi_ago"="杩欏彴璁惧浠ュ墠閰嶈繃缃戠粶";
+"wifi_config_seria_num"="璁惧鏈鸿韩涓婄殑9浣嶅簭鍒楀彿";
+"wifi_config_verify_code"="楠岃瘉鐮�";
+"wifi_config_connected"="鎴戝凡杩炴帴濂�";
+"wifi_config_select_set_param"="閫夋嫨\"璁剧疆鍙傛暟\"";
+"wifi_config_select_wifi"="閫夋嫨\"Wi-Fi\"";
+"wifi_config_net_work"="閰嶇疆缃戠粶";
+"wifi_config_name"="鍚嶇О锛�";
+"wifi_config_copy_pwd"="澶嶅埗瀵嗙爜";
+"wifi_config_to_setting"="杩涘叆璁剧疆椤甸潰";
+"wifi_config_step_three"="杩斿洖APP锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��";
+"wifi_config_tip"="璇烽�氳繃涓嬪垪姝ラ灏嗘墜鏈鸿繛鎺ュ埌璁惧Wi-Fi锛�";
+"wifi_config_step_three_tip"="(娉ㄦ剰锛氬鏋滆澶嘩IFI鍚嶇О涓嶆槸鈥淓ZVIZ鈥濆墠缂�鐨勶紝璇峰鍒跺瘑鐮佸悗鏍规嵁鏂扮殑鍓嶇紑鍚嶅瓧锛屾墜鍔ㄤ慨鏀瑰瘑鐮佺殑鍓嶇紑骞惰繛鎺ュ嵆鍙�備緥濡傗�淪oftAP_XXXXXXX鈥�)";
+"wifi_config_not_connected"="灏氭湭杩炴帴缃戠粶";
+"wifi_config_step_1_tips"="寰呰繛鎺ョ殑璁惧Wi-Fi淇℃伅濡備笅锛�";
+"wifi_config_step_2_tips"="濡傛灉浣犱娇鐢ㄧ殑鏄弻棰戣矾鐢卞櫒锛岃涓嶈璁╂憚鍍忔満杩炴帴5G棰戞鐨刉i-Fi";
+"wifi_config_step_2_next_step"="涓嬩竴姝�";
+"wifi_config_step_2_net"="缃戠粶锛�";
+"wifi_config_step_2_password"="瀵嗙爜锛�";
+
"ui_last_update"="鏈�鍚庢洿鏂帮細";
"ui_last_update_empty"="鏈�鍚庢洿鏂帮細鏃犺褰�";
"ui_just_now"="鍒氬垰";
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 1e28e4d..da5ba70 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -140,6 +140,7 @@
// return;
//}
+ //return;
try
{
@@ -236,7 +237,6 @@
-
//===================璇诲彇鍙瀵硅鏁版嵁==========================
//鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅icon
//var flVideoInfo = HttpRequest.CheckFlVideo();
@@ -282,6 +282,7 @@
}
}
+
//======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
//濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
@@ -297,6 +298,7 @@
}
else if (isInterphoneType_FREEVIEW)
{
+
//HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -310,6 +312,8 @@
HDLLinphone.Current.LogoutAllAccount();
}
}
+
+
//======================鐧诲綍鍏ㄨ閫�====================
if (isInterphoneType_FREEVIEW)
@@ -345,12 +349,13 @@
complateDevice = true;
MainPage.Log($"============璁惧============瀹屾垚" + FunctionList.List.Functions.Count);
}
- //})
- //{ IsBackground = true }.Start();
+ //})
+ //{ IsBackground = true }.Start();
- ////===================鍦烘櫙==========================
- //new System.Threading.Thread(() =>
- //{
+ ////===================鍦烘櫙==========================
+ //new System.Threading.Thread(() =>
+ //{
+
try
{
complateScene = false;
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 449da8d..c2dec7d 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -544,7 +544,7 @@
var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString());
if (homeList == null || homeList.Count == 0)
{
- if (DB_ResidenceData.Instance.CurrentRegion.id != "")
+ if (DB_ResidenceData.Instance.CurrentRegion!=null && DB_ResidenceData.Instance.CurrentRegion.id != "")
{
Shared.Application.RunOnMainThread(() =>
{
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index f759daa..52f4a76 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -242,7 +242,10 @@
}
else
{
- new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
+ //Application.RunOnMainThread(() =>
+ //{
+ // new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
+ //});
}
}
catch { }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index e527034..1f82321 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using Shared;
using HDL_ON.DAL.Server;
+using Foundation;
#if __IOS__
#else
using Com.Videogo.Hdl;
@@ -61,6 +62,9 @@
this.GetYingshiDeviceList(serials);
};
EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate;
+ NSObject[] nSObject = new NSObject[1];
+ nSObject[0] = new NSString("DP1");
+ EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject;
EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
#else
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
index 42919c2..409c93e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -216,9 +216,15 @@
};
cellFrame.AddChidren(btnCell);
+#if __IOS__
+ btnCell.Width += 5;
+ cellFrame.Width += 5;
+#else
+#endif
- //闂ㄩ攣鐘舵��
- btnDoorLockIcon = new Button
+
+ //闂ㄩ攣鐘舵��
+ btnDoorLockIcon = new Button
{
X = Application.GetRealWidth(65),
Y = Application.GetRealHeight(108),
@@ -371,12 +377,14 @@
private void CalculatedPosition()
{
this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth();
+ this.btnCurrDeviceName.Width += 10;
if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X)
{
//閲嶆柊璁＄畻瀹藉害
this.btnCurrDeviceName.Width = this.btnCollectIcon.X + Application.GetRealWidth(-10);
}
this.btnCurrDeviceRoom.Width = this.btnCurrDeviceRoom.GetTextWidth();
+ this.btnCurrDeviceRoom.Width += 10;
if (this.btnCurrDeviceRoom.GetTextWidth() > this.btnCollectIcon.X)
{
//閲嶆柊璁＄畻瀹藉害
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 8d4483c..dc7aca0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/SiriIntents/SiriIntents.csproj b/SiriIntents/SiriIntents.csproj
index 150b9bd..a36210c 100644
--- a/SiriIntents/SiriIntents.csproj
+++ b/SiriIntents/SiriIntents.csproj
@@ -79,7 +79,6 @@
<MtouchArch>ARM64</MtouchArch>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
- <CodesignProvision>OnProSiri230329-1-Dev</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/SiriIntentsUI/SiriIntentsUI.csproj b/SiriIntentsUI/SiriIntentsUI.csproj
index 8b52df8..da2da8b 100644
--- a/SiriIntentsUI/SiriIntentsUI.csproj
+++ b/SiriIntentsUI/SiriIntentsUI.csproj
@@ -83,7 +83,6 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodesignProvision>OnProSiriUI230329-1-Dev</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
--
Gitblit v1.8.0