From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

---
 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 5ba138a..366fa8d 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -654,6 +654,16 @@
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelTip.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\time.png" />
     <AndroidAsset Include="Assets\Phone\Public\ClearIcon.png" />
+    <AndroidAsset Include="Assets\Phone\ErrorIcon.png" />
+    <AndroidAsset Include="Assets\Phone\oRobot.png" />
+    <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIcon.png" />
+    <AndroidAsset Include="Assets\Phone\Public\PopupDialog.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />

--
Gitblit v1.8.0