Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -48,6 +48,8 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

  <ItemGroup>

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

@@ -82,18 +84,10 @@
    <Reference Include="MQTTnet.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.GDMapKit">

      <HintPath>..\Shared\DLL\Shared.Droid.GDMapKit.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.PickerView">

      <HintPath>..\Shared\DLL\Shared.Droid.PickerView.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.TouchID">

      <HintPath>..\Shared\DLL\Shared.Droid.TouchID.dll</HintPath>

    </Reference>

    <Reference Include="System" />

    <Reference Include="System.IO.Compression" />

    <Reference Include="System.Net.Http" />

    <Reference Include="System.Xml" />

    <Reference Include="System.Core" />

    <Reference Include="Mono.Android" />

@@ -132,12 +126,6 @@
    </Reference>

    <Reference Include="Microsoft.AppCenter.Analytics">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.TBL">

      <HintPath>..\Shared\DLL\Shared.Droid.TBL.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.TCL">

      <HintPath>..\Shared\DLL\Shared.Droid.TCL.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.HDLWidget">

      <HintPath>..\Shared\DLL\Shared.Droid.HDLWidget.dll</HintPath>

@@ -352,12 +340,10 @@
    <AndroidAsset Include="Assets\Phone\Item\Time.png" />

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

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

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

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

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

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

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

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

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

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

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

@@ -541,7 +527,6 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\PanelTwoButton.png" />

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

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

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

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

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

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

@@ -581,4 +566,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>