Merge branch 'WJC' into NewFilePath

wxr

2021-01-14 d987694e57c3bce76bd5a208d74a3696db222a4a

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -87,9 +87,11 @@
        <Reference Include="Shared.IOS.JLCountryCode">
          <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
        </Reference>
        <Reference Include="HdlBluWi">
          <HintPath>..\DLL\IOS\HdlBluWi.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
      <PackageReference Include="Newtonsoft.Json">
        <Version>12.0.3</Version>
      </PackageReference>
@@ -97,16 +99,22 @@
        <Version>3.0.13</Version>
      </PackageReference>
      <PackageReference Include="Microsoft.AppCenter.Analytics">
        <Version>4.0.0</Version>
        <Version>4.1.0</Version>
      </PackageReference>
      <PackageReference Include="Microsoft.AppCenter.Crashes">
        <Version>4.0.0</Version>
        <Version>4.1.0</Version>
      </PackageReference>
      <PackageReference Include="ZXing.Net.Mobile">
        <Version>2.4.1</Version>
      </PackageReference>
      <PackageReference Include="RestSharp">
        <Version>106.11.7</Version>
      </PackageReference>
      <PackageReference Include="Xamarin.iOS.Bugly">
        <Version>1.0.4</Version>
      </PackageReference>
      <PackageReference Include="Xamarin.Essentials">
        <Version>1.6.0</Version>
      </PackageReference>
    </ItemGroup>
    <ItemGroup>
@@ -182,6 +190,7 @@
        <Folder Include="Resources\Phone\Intelligence\Gallery\" />
        <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
        <Folder Include="Other\" />
        <Folder Include="Resources\zh-Hans.lproj\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -203,6 +212,7 @@
        <Compile Include="Scan.cs" />
        <Compile Include="ZXingOverlayView.cs" />
        <Compile Include="Other\JLCountrycode.cs" />
        <Compile Include="BlueWifi.cs" />
    </ItemGroup>
    <ItemGroup>
      <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -638,6 +648,18 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIcon.png" />
      <BundleResource Include="Resources\Phone\Public\PopupDialog.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\CozyIconOn.png" />
      <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>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
@@ -645,4 +667,13 @@
    </ItemGroup>
    <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
    <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
    <ProjectExtensions>
      <MonoDevelop>
        <Properties>
          <Policies>
            <DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="Hierarchical" />
          </Policies>
        </Properties>
      </MonoDevelop>
    </ProjectExtensions>
</Project>