From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL-ON_Android/HDL-ON_Android.csproj | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 6ce18d8..c04a550 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -605,6 +605,16 @@
<AndroidAsset Include="Assets\Phone\Collection\MesCenter\AlarmOn.png" />
<AndroidAsset Include="Assets\Phone\Collection\MesCenter\ShareOn.png" />
<AndroidAsset Include="Assets\Phone\Collection\MesCenter\SystemOn.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg1.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg2.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg3.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg4.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg5.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg6.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg7.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0