Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/DroidLib/DroidLib.csproj

@@ -8,7 +8,7 @@
    <OutputType>Library</OutputType>

    <RootNamespace>DroidLib</RootNamespace>

    <AssemblyName>DroidLib</AssemblyName>

    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>

    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>

    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>

    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>

  </PropertyGroup>

@@ -54,7 +54,6 @@
  </ItemGroup>

  <ItemGroup>

    <EmbeddedJar Include="Jars\android-viewbadger.jar" />

    <EmbeddedJar Include="Jars\ElianZigBee.Droid20181116.jar" />

    <EmbeddedJar Include="Jars\jcore-android-1.2.7.jar" />

    <EmbeddedJar Include="Jars\jpush-android-3.2.0.jar" />

  </ItemGroup>