From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 07e5219..b889fe2 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -52,6 +52,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
+ <CodesignProvision>ComHdlOnProDevelopment20201224-3</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -89,7 +90,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
@@ -646,6 +647,12 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIconOn.png" />
<BundleResource Include="Resources\zh-Hans.lproj\InfoPlist.strings" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\DiyThumbIconOn.png" />
+ <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg2.png" />
+ <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg3.png" />
+ <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg1.png" />
+ <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg4.png" />
+ <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg5.png" />
<BundleResource Include="Resources\Phone\LogicIcon\location.png" />
<BundleResource Include="Resources\Phone\LoginIcon\changesinoutdoor.png" />
</ItemGroup>
--
Gitblit v1.8.0