Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -507,7 +507,6 @@
    <AndroidAsset Include="Assets\Phone\Item\UpperTriangle.png" />

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

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

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

    <AndroidAsset Include="Assets\Phone\Navigation\Category.png" />

    <AndroidAsset Include="Assets\Phone\Navigation\CategorySelected.png" />

    <AndroidAsset Include="Assets\Phone\Navigation\Home.png" />

@@ -2087,9 +2086,6 @@
    <AndroidAsset Include="Assets\Phone\Item\NormallyOpen.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Logo\2.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

@@ -2161,6 +2157,12 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\PM2.5Sensor\TemperaturePic.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Logo\StartBackGroud.png" />

  </ItemGroup>

  <ItemGroup>

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