Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 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>