From 4f65e73a1244ab023f3d350a129ed8118c439154 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 11 四月 2023 14:44:38 +0800
Subject: [PATCH] 1.更新EZSDK.IOS.dll包 2.进入门锁视频界面增加loading
---
HDL-ON_iOS/Resources/Language.ini | 2 +-
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.png | 0
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 2 ++
HDL-ON_iOS/HDL-ON_iOS.csproj | 4 ++--
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/UI/MainPage.cs | 2 +-
HDL_ON/DAL/Mqtt/MqttClient.cs | 2 +-
7 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index e3d368f..e3e147e 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 5cda6b8..0518a24 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1545,7 +1545,6 @@
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockClose.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
@@ -1566,7 +1565,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
@@ -1576,6 +1574,8 @@
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c5006a0..dafbdd6 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -2395,7 +2395,7 @@
8510=鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
8511=鐢ㄦ埛浜哄憳
8512=搴忓垪鍙�
-8513=妯″紡
+8513=鍨嬪彿
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockClose.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.png
similarity index 100%
rename from HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockClose.png
rename to HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.png
Binary files differ
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 94ae641..2dde971 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -852,7 +852,7 @@
static void ReceiveNotifySqueezeAsync(string mMes)
{
#if DEBUG
- return;
+ //return;
#endif
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4aa662a..aaaf1c7 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.6";
+ public static string VersionString = "1.7.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 37fa625..ee7e909 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -214,6 +214,7 @@
public void InitializationAndroidData(Action<bool> action)
{
bool isBool = true;
+ this.Loading.Start();
this.SunThread(() =>
{
try
@@ -260,6 +261,7 @@
{
this.MainThread(() =>
{
+ this.Loading.Hide();
action?.Invoke(isBool);
});
}
--
Gitblit v1.8.0