From f8d49e136e064fa8c14af7dd22be6635b245c763 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 三月 2023 13:45:06 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ef8ad4d..dc772e4 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1289,30 +1289,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
- <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\UnConnect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
- <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\Public\BatteryEnough.png" />
<BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
@@ -1569,6 +1545,38 @@
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<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" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\RTV.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Cell.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocking.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\HistoryList.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
+ <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" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocked.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0