From 802f200c004348defca5cefd047ad843c74abadd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 01 四月 2021 09:21:42 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 48b10a5..c2f83ed 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -446,6 +446,7 @@
<Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Energy\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1195,6 +1196,26 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
<BundleResource Include="Resources\Phone\PirIcon\add.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Energy\EnergyDrodDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Energy.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Comfortable.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Humidification.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Ventilate.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0