合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -52,6 +52,12 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

  <ItemGroup>

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

@@ -418,7 +424,6 @@
    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1Selected.png" />

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

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

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

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

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

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

@@ -537,32 +542,6 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\SensorMotion.png" />

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

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

    <AndroidAsset Include="Assets\Phone\Room\HomeBG.png" />

    <AndroidAsset Include="Assets\Phone\Room\r0.png" />

    <AndroidAsset Include="Assets\Phone\Room\r1.png" />

    <AndroidAsset Include="Assets\Phone\Room\r10.png" />

    <AndroidAsset Include="Assets\Phone\Room\r11.png" />

    <AndroidAsset Include="Assets\Phone\Room\r12.png" />

    <AndroidAsset Include="Assets\Phone\Room\r13.png" />

    <AndroidAsset Include="Assets\Phone\Room\r14.png" />

    <AndroidAsset Include="Assets\Phone\Room\r15.png" />

    <AndroidAsset Include="Assets\Phone\Room\r16.png" />

    <AndroidAsset Include="Assets\Phone\Room\r17.png" />

    <AndroidAsset Include="Assets\Phone\Room\r18.png" />

    <AndroidAsset Include="Assets\Phone\Room\r19.png" />

    <AndroidAsset Include="Assets\Phone\Room\r2.png" />

    <AndroidAsset Include="Assets\Phone\Room\r20.png" />

    <AndroidAsset Include="Assets\Phone\Room\r21.png" />

    <AndroidAsset Include="Assets\Phone\Room\r22.png" />

    <AndroidAsset Include="Assets\Phone\Room\r23.png" />

    <AndroidAsset Include="Assets\Phone\Room\r24.png" />

    <AndroidAsset Include="Assets\Phone\Room\r3.png" />

    <AndroidAsset Include="Assets\Phone\Room\r4.png" />

    <AndroidAsset Include="Assets\Phone\Room\r5.png" />

    <AndroidAsset Include="Assets\Phone\Room\r6.png" />

    <AndroidAsset Include="Assets\Phone\Room\r7.png" />

    <AndroidAsset Include="Assets\Phone\Room\r8.png" />

    <AndroidAsset Include="Assets\Phone\Room\r9.png" />

    <AndroidAsset Include="Assets\Phone\Room\RoomCardView.png" />

    <AndroidAsset Include="Assets\Phone\Room\RoomCardView_Name.png" />

    <AndroidAsset Include="Assets\Phone\Room\Room_Rectangle.png" />

@@ -597,12 +576,6 @@
  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\iconBackgroundColor.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\iconSelectedBackgroundColor.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\1.png" />

@@ -844,6 +817,69 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\withdrawal.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\FavoriteRoom.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\ItemSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\ItemUnSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\ItemUnSelected_Black.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Room\NoNameRoom.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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