From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL-ON_Android/HDL-ON_Android.csproj | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index d573dd5..4b195b8 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -230,6 +230,17 @@
<AndroidAsset Include="Assets\Phone\Public\MsgIcon\CallIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\MsgIcon\AnswerIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\MsgIcon\HangUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\DataIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\CAC\JinMaoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\hvaccac.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
+ <AndroidAsset Include="Assets\Phone\Public\dialogBg2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhelp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpAlarmBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1436,6 +1447,8 @@
<ItemGroup>
<Folder Include="libs\arm64-v8a\" />
<Folder Include="Zxing\" />
+ <Folder Include="Assets\Phone\FunctionIcon\CAC\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Panel\" />
</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