Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -125,6 +125,9 @@
    <Reference Include="Shared.Droid.JLCountryCode">
      <HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath>
    </Reference>
    <Reference Include="JPushAndroid">
      <HintPath>..\DLL\Android\JPushAndroid.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />
@@ -135,6 +138,7 @@
    <Compile Include="ZXingCustomScanView.cs" />
    <Compile Include="ZXingOverlayView.cs" />
    <Compile Include="Other\JLCountrycode.cs" />
    <Compile Include="JPush.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\AboutResources.txt" />
@@ -214,7 +218,7 @@
      <Version>12.0.3</Version>
    </PackageReference>
    <PackageReference Include="MQTTnet">
      <Version>3.0.8</Version>
      <Version>3.0.13</Version>
    </PackageReference>
    <PackageReference Include="ZXing.Net.Mobile">
      <Version>2.4.1</Version>
@@ -593,6 +597,28 @@
    <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />
    <AndroidAsset Include="Assets\Phone\PersonalCenter\Head.png" />
    <AndroidAsset Include="Assets\Phone\PersonalCenter\Transfer.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\All.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\System.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Alarm.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AllOn.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Share.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AlarmOn.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\ShareOn.png" />
    <AndroidAsset Include="Assets\Phone\Collection\MesCenter\SystemOn.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg1.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg2.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg3.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg4.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg5.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg6.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg7.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
  </ItemGroup>
  <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />