From 5f46903845cf9b2cb4d7f186370d3eb7fb6c9577 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 21 一月 2021 16:05:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL-ON_Android/HDL-ON_Android.csproj | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index da8dbb9..5508cf8 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -209,7 +209,7 @@
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
- <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -670,6 +670,12 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIconOn.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\DiyThumbIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg2.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg3.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg1.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg4.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg5.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\location.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\changesinoutdoor.png" />
</ItemGroup>
--
Gitblit v1.8.0