Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -2137,6 +2137,30 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\PM2.5Sensor\TemperaturePic.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')" />