请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -41,6 +41,8 @@
    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidKeyStore>True</AndroidKeyStore>

    <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL\ Home/HDL\ Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

    <DebugSymbols>true</DebugSymbols>

@@ -56,6 +58,8 @@
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

    <AndroidKeyStore>True</AndroidKeyStore>

    <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">

@@ -2320,6 +2324,15 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\BatterySelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\videoIntercom.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\videoIntercomNext.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\SynchronizationSelected.png" />

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />