Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -51,6 +51,7 @@
        <MtouchDebug>true</MtouchDebug>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchLink>SdkOnly</MtouchLink>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -62,6 +63,7 @@
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
        <CodesignProvision>dis-onpro-080401</CodesignProvision>
        <MtouchLink>SdkOnly</MtouchLink>
    </PropertyGroup>
    <ItemGroup>
        <Reference Include="System" />
@@ -82,6 +84,9 @@
        <Reference Include="MJRefresh_Xamarin">
          <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.JLCountryCode">
          <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
@@ -89,16 +94,19 @@
        <Version>12.0.2</Version>
      </PackageReference>
      <PackageReference Include="MQTTnet">
        <Version>3.0.8</Version>
        <Version>3.0.13</Version>
      </PackageReference>
      <PackageReference Include="Microsoft.AppCenter.Analytics">
        <Version>3.1.0</Version>
        <Version>4.0.0</Version>
      </PackageReference>
      <PackageReference Include="Microsoft.AppCenter.Crashes">
        <Version>3.1.0</Version>
        <Version>4.0.0</Version>
      </PackageReference>
      <PackageReference Include="ZXing.Net.Mobile">
        <Version>2.4.1</Version>
      </PackageReference>
      <PackageReference Include="RestSharp">
        <Version>106.11.7</Version>
      </PackageReference>
    </ItemGroup>
    <ItemGroup>
@@ -173,6 +181,7 @@
        <Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" />
        <Folder Include="Resources\Phone\Intelligence\Gallery\" />
        <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
        <Folder Include="Other\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -193,6 +202,7 @@
        <Compile Include="Reachability.cs" />
        <Compile Include="Scan.cs" />
        <Compile Include="ZXingOverlayView.cs" />
        <Compile Include="Other\JLCountrycode.cs" />
    </ItemGroup>
    <ItemGroup>
      <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -547,6 +557,22 @@
      <BundleResource Include="Resources\Phone\OnIcon.png" />
      <BundleResource Include="Resources\Phone\TipNot.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DeviceIcon\VoicePanelIcon.png" />
      <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_3.png" />
      <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
      <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
      <BundleResource Include="Resources\Phone\LoginIcon\Server.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\ServerInfo.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Function.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Search.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Menu.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Help.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Telephone.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\SendMessage.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Scene.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Support\Close.png" />
      <BundleResource Include="Resources\Phone\Public\Search.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Head.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\Transfer.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />