请合并最新的代码（完成门锁功能）

xm

2019-11-27 a2d26f15b940c853faaf6d6959b16a6d919cb800

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -19,6 +19,11 @@
    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>

    <NuGetPackageImportStamp>

    </NuGetPackageImportStamp>

    <AndroidKeyStore>true</AndroidKeyStore>

    <AndroidSigningKeyStore>C:\Users\admin\AppData\Local\Xamarin\Mono for Android\Keystore\HDL Home\HDL Home.keystore</AndroidSigningKeyStore>

    <AndroidSigningStorePass>85521566</AndroidSigningStorePass>

    <AndroidSigningKeyAlias>HDL Home</AndroidSigningKeyAlias>

    <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -34,7 +39,8 @@
    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <AndroidKeyStore></AndroidKeyStore>

    <AndroidSigningKeyStore>/Users/hdl/Library/Developer/Xamarin/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -48,7 +54,6 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

@@ -88,12 +93,6 @@
    <Reference Include="MQTTnet.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.HDLWidget">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.TouchID">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.TouchID.dll</HintPath>

    </Reference>

@@ -103,9 +102,6 @@
    <Reference Include="System.Xml" />

    <Reference Include="System.Core" />

    <Reference Include="Mono.Android" />

    <Reference Include="Newtonsoft.Json">

      <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>

    </Reference>

    <Reference Include="System.Web.Services" />

    <Reference Include="Security">

      <HintPath>..\Shared\DLL\Security.dll</HintPath>

@@ -186,6 +182,22 @@
    </Reference>

    <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>

    </Reference>

    <Reference Include="Newtonsoft.Json">

      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>

    </Reference>

    <Reference Include="System.Json" />

    <Reference Include="Shared.Droid">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.HDLWidget">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.Smartrefresh">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>

    </Reference>

  </ItemGroup>

  <ItemGroup>

@@ -1030,12 +1042,6 @@
    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySearching.png" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Light\OFF.png" />

  </ItemGroup>

  <ItemGroup>

@@ -1200,6 +1206,27 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\AC\SwingBackground.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Account\Back.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')" />