From 94ddcc461b3528fb3bf977c653f513205f5e18ef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 14:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into Dev-Wxr
---
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 4 ++--
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/DAL/Mqtt/MqttClient.cs | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index f6f0270..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 da4bd8b..8958497 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1547,7 +1547,6 @@
<BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" />
<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" />
@@ -1568,7 +1567,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" />
@@ -1579,6 +1577,8 @@
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.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/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 12026aa..f5b5a83 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -870,7 +870,7 @@
static void ReceiveNotifySqueezeAsync(string mMes)
{
#if DEBUG
- return;
+ //return;
#endif
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
--
Gitblit v1.8.0