From 76f93f093282d72e97894132277d3412b6bf8bea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 20 九月 2022 13:31:27 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4d0e1ee..f4474d5 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -290,6 +290,14 @@
<AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\PowerOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\NightIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\CoolIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\CollectionIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TopViewBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\PowerOffIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\MsgViewBg.png" />
<AndroidAsset Include="Assets\h5\static\js\pages-index-index.f20b87f0.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.749511eb.js" />
<AndroidAsset Include="Assets\h5\static\js\chunk-vendors.9e7e69a0.js" />
@@ -1508,6 +1516,7 @@
<Folder Include="Zxing\" />
<Folder Include="Assets\Phone\FunctionIcon\CAC\" />
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Acst\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
--
Gitblit v1.8.0