请合并，门锁和晾衣架第一版代码

xm

2020-12-10 3aa397ab145382935492b11c1f18c9634e69910b

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -39,9 +39,9 @@
    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <AndroidDexTool>d8</AndroidDexTool>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

<AndroidKeyStore></AndroidKeyStore>

    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>

    <AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -57,7 +57,6 @@
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

  <ItemGroup>

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

@@ -216,6 +215,38 @@
    <None Include="Properties\AndroidManifest.xml">

      <SubType>Designer</SubType>

    </None>

    <AndroidAsset Include="Assets\Phone\Instruct\AirQualitySensor.png" />

    <AndroidAsset Include="Assets\Phone\Device\Airer.png" />

    <AndroidAsset Include="Assets\Phone\Device\AirerSelected.png" />

    <AndroidAsset Include="Assets\Phone\Device\AirerSelected2.png" />

    <AndroidAsset Include="Assets\Phone\Device\AirQualitySensor.png" />

    <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected.png" />

    <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected2.png" />

    <AndroidAsset Include="Assets\Phone\Airer\WindOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\Stop.png" />

    <AndroidAsset Include="Assets\Phone\Airer\LightSelected.png" />

    <AndroidAsset Include="Assets\Phone\Airer\.DS_Store" />

    <AndroidAsset Include="Assets\Phone\Airer\StopOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\Dry.png" />

    <AndroidAsset Include="Assets\Phone\Airer\Up.png" />

    <AndroidAsset Include="Assets\Phone\Airer\Down.png" />

    <AndroidAsset Include="Assets\Phone\Airer\DetailAirerPic.png" />

    <AndroidAsset Include="Assets\Phone\Airer\DisinfectOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\LightOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\Airer216.png" />

    <AndroidAsset Include="Assets\Phone\Airer\DryOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\AirerOnrange108.png" />

    <AndroidAsset Include="Assets\Phone\Airer\UpOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\DownOffline.png" />

    <AndroidAsset Include="Assets\Phone\Airer\DisinfectSelected.png" />

    <AndroidAsset Include="Assets\Phone\Airer\FunctionPic.png" />

    <AndroidAsset Include="Assets\Phone\Airer\Wind.png" />

    <AndroidAsset Include="Assets\Phone\DoorLock\AddFaceIDTipPic.png" />

    <AndroidAsset Include="Assets\Phone\DoorLock\faceId.png" />

    <AndroidAsset Include="Assets\Phone\DoorLock\faceIdOn.png" />

    <AndroidAsset Include="Assets\Phone\Instruct\Airer.png" />

    <AndroidAsset Include="Assets\Phone\Airer\AirerFunPic.png" />

    <AndroidAsset Include="Assets\Phone\RealDevice\Airer.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidResource Include="Resources\layout\Main.axml" />

@@ -2374,12 +2405,6 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SmartSound\CheckBoxDef.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SmartSound\CheckBoxSel.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SmartSound\Nickname.png" />

  </ItemGroup>

  <ItemGroup>

@@ -2517,6 +2542,21 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon16.png" />

  </ItemGroup>

  <ItemGroup>

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