From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL-ON_Android/HDL-ON_Android.csproj | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 3fa25c4..7d9cfd9 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -939,7 +939,34 @@
<AndroidAsset Include="Assets\Phone\PirIcon\4.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\right.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVAV.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\29.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\13.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\20.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\LowerLimit.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\18.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\InfoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Bg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\5.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\UpperLimit.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\6.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\45.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0