From da1a17600b9ca8c8980ba64447688ee0a6718756 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 13 六月 2022 11:56:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr0114
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 8dc594d..c72dc16 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -105,14 +105,11 @@
<Reference Include="Shared.IOS.LCVideoOnSDK">
<HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.HDLSceneSiri">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.HDLLinphoneSDK">
<HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.HDLFVSDK">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
+ <Reference Include="Shared.IOS.HDLSceneSiri">
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -488,6 +485,8 @@
<Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
<Folder Include="Base.lproj\" />
+ <Folder Include="Resources\Phone\FunctionIcon\CAC\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Panel\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1389,6 +1388,24 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" />
<BundleResource Include="Resources\Phone\Collection\FunctionOfflineBg.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\CallIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\AnswerIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\HangUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\CAC\DataIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\CAC\JinMaoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\hvaccac.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
+ <BundleResource Include="Resources\Phone\Public\dialogBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhelp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpAlarmBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\screenpanel.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelEnviBg.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\order.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\single_cycle.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0