Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -35,10 +35,6 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -52,10 +48,6 @@
    <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>

@@ -228,12 +220,6 @@
  </ItemGroup>

  <ItemGroup>

    <AndroidResource Include="Resources\xml\file_paths.xml" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Language.ini" />

@@ -421,19 +407,14 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" />

    <AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />

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

    <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\RealGateway1.png" />

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

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

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

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

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

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

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

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

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

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

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

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

@@ -483,6 +464,8 @@
    <AndroidAsset Include="Assets\Phone\Item\OpenIcon.png" />

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

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

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

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

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

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

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

@@ -1032,6 +1015,39 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

@@ -1043,4 +1059,4 @@
  <Import Project="..\packages\Xamarin.Android.Support.v4.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.v4.targets')" />

  <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Vector.Drawable.targets')" />

  <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />

</Project>
</Project>