From 551e82d33c9c23442e0ecd320bcfc752f300d9ef Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 22 三月 2021 09:20:03 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 1afe79b..2cf6254 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -435,7 +435,6 @@
<Folder Include="Resources\Phone\FunctionIcon\Electrical\" />
<Folder Include="Resources\Phone\FunctionIcon\Socket\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
- <Folder Include="Resources\Phone\Public\AirIcon\" />
<Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" />
<Folder Include="Resources\Phone\Intelligence\Gallery\" />
<Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
@@ -444,6 +443,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
+ <Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -669,18 +669,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" />
<BundleResource Include="Resources\Phone\Collection\NoCollectionBg.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" />
- <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" />
<BundleResource Include="Resources\Phone\MusicIcon\bluetooth.png" />
<BundleResource Include="Resources\Phone\MusicIcon\addMusic1.png" />
<BundleResource Include="Resources\Phone\MusicIcon\prve1Selected.png" />
@@ -1161,12 +1149,49 @@
<BundleResource Include="Resources\Phone\PirIcon\succeed.png" />
<BundleResource Include="Resources\Phone\VideoIcon\hangup.png" />
<BundleResource Include="Resources\Phone\VideoIcon\danyuanji.png" />
- <BundleResource Include="Resources\Phone\VideoIcon\.DS_Store" />
<BundleResource Include="Resources\Phone\VideoIcon\weiqiangji.png" />
<BundleResource Include="Resources\Phone\VideoIcon\keshiduijiang.png" />
<BundleResource Include="Resources\Phone\VideoIcon\phone.png" />
<BundleResource Include="Resources\Phone\VideoIcon\menjin.png" />
<BundleResource Include="Resources\Phone\VideoIcon\answer.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVAV.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Co2Bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HumidityBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocBg.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" />
+ <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\0.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\4.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\5.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\6.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\13.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\18.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\20.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\29.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\45.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\LowerLimit.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\UpperLimit.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Co2Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HumidityIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\InfoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm25Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
<BundleResource Include="Resources\Phone\PirIcon\add.png" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0