From d13ce7db9d7188c237df446dcc51e25af64ca321 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:36:34 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 6f1d223..c459620 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -459,6 +459,7 @@
<Folder Include="Assets.xcassets\device_bg.imageset\" />
<Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" />
<Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1328,6 +1329,24 @@
<BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AddTargetIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\RightIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FaceIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\DefenseStatusIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\DisarmStatusIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\DefenseAlarmIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceInAlarmIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FailIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\TrueIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhcho.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalbreaker.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\security.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0