From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 215 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 158 insertions(+), 57 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 6feb6b0..8a39e81 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -32,9 +32,14 @@
<MandroidI18n>CJK</MandroidI18n>
<AndroidTlsProvider>btls</AndroidTlsProvider>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
- <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
- <AndroidSupportedAbis />
+ <AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
<AndroidDexTool>d8</AndroidDexTool>
+<AndroidSigningKeyStore>/Users/guoxuecheng/Desktop/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>
+<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
+<AndroidSigningKeyAlias>HDL Home</AndroidSigningKeyAlias>
+<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
+<AndroidKeyStore>True</AndroidKeyStore>
+<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -48,14 +53,12 @@
<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">
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
- </Reference>
- <Reference Include="M2Mqtt.Net, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Shared\DLL\M2Mqtt.Net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
@@ -82,24 +85,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" />
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System.Web.Services" />
<Reference Include="Security">
<HintPath>..\Shared\DLL\Security.dll</HintPath>
@@ -133,44 +122,59 @@
<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 Include="Newtonsoft.Json">
+ <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\Shared\DLL\Shared.Droid.HDLWidget.dll</HintPath>
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.Android.Support.Annotations">
- <HintPath>..\packages\Xamarin.Android.Support.Annotations.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Annotations.dll</HintPath>
+ <Reference Include="Shared.Droid.TouchID">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.TouchID.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.Android.Support.Compat">
- <HintPath>..\packages\Xamarin.Android.Support.Compat.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Compat.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.Android.Support.Core.UI">
- <HintPath>..\packages\Xamarin.Android.Support.Core.UI.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Core.UI.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.Android.Support.Core.Utils">
- <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Core.Utils.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.Android.Support.Media.Compat">
- <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Media.Compat.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.Android.Support.Fragment">
- <HintPath>..\packages\Xamarin.Android.Support.Fragment.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Fragment.dll</HintPath>
+ <Reference Include="Xamarin.Android.Support.v7.AppCompat">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v4">
- <HintPath>..\packages\Xamarin.Android.Support.v4.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.v4.dll</HintPath>
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
- <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Media.Compat">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Fragment">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Fragment.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Core.Utils">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.Utils.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Core.UI">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.UI.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Compat">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Compat.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Annotations">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Annotations.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
- <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Arch.Core.Common">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid">
- <HintPath>..\Shared\DLL\Shared.Droid.dll</HintPath>
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="M2Mqtt.Net">
+ <HintPath>..\Shared\DLL\M2Mqtt.Net.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -352,12 +356,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" />
@@ -381,7 +383,6 @@
<AndroidAsset Include="Assets\Phone\Item\Point.png" />
<AndroidAsset Include="Assets\Phone\Item\Search.png" />
<AndroidAsset Include="Assets\Phone\Item\SwitchSelected.png" />
- <AndroidAsset Include="Assets\Phone\Item\ThirdPartyDevice.png" />
<AndroidAsset Include="Assets\Phone\Item\NextSelected.png" />
<AndroidAsset Include="Assets\Phone\Item\Timer.png" />
<AndroidAsset Include="Assets\Phone\Item\ShardMenu.png" />
@@ -418,7 +419,6 @@
<AndroidAsset Include="Assets\Phone\Item\FixedPosition.png" />
<AndroidAsset Include="Assets\Phone\Item\GarrisonListSelected.png" />
<AndroidAsset Include="Assets\Phone\Item\Back.png" />
- <AndroidAsset Include="Assets\Phone\Item\Scene.png" />
<AndroidAsset Include="Assets\Phone\Item\FunctionViewBG.png" />
<AndroidAsset Include="Assets\Phone\Item\SceneFunctionBG.png" />
<AndroidAsset Include="Assets\Phone\Item\SelectHouse.png" />
@@ -539,23 +539,124 @@
<AndroidAsset Include="Assets\Phone\RealDevice\SensorCarbonMonoxide.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorWater.png" />
<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" />
- <AndroidAsset Include="Assets\Phone\Gateway\SearchGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayImage.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6Selected.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WirelessGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayInstruct.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewaySelected.png" />
<AndroidAsset Include="Assets\Phone\Item\More.png" />
<AndroidAsset Include="Assets\Phone\Item\SelectFloor_Right.png" />
+ <AndroidAsset Include="Assets\Phone\Room\Room_IconSelectedBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Room\Room_IconUnselectedBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\Selected.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\SceneIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Account\QQ.png" />
+ <AndroidAsset Include="Assets\Phone\Account\Wechat.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\Stop.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\DownSelected.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\Up.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\Down.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\StopSelected.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\OpenSelected.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\UpSelected.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\Open.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\CloseSelected.png" />
+ <AndroidAsset Include="Assets\Phone\RollerShade\Close.png" />
+ <AndroidAsset Include="Assets\Phone\Light\OFF.png" />
+ <AndroidAsset Include="Assets\Phone\Light\OFFSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Light\ON.png" />
+ <AndroidAsset Include="Assets\Phone\Light\OnOff.png" />
+ <AndroidAsset Include="Assets\Phone\Light\ONSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Light\Plug.png" />
+ <AndroidAsset Include="Assets\Phone\Light\PlugSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Assets\Phone\Scene\" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Safeguard\SafetyShortcut.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Safeguard\SafetyShortcutSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDevice.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Account\QQ.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Account\Wechat.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\HadAuthority.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Safeguard\SafeguardPasswordGround.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\PhoneBook.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\Close.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\CloseSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\Down.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\DownSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\Open.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\OpenSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\Stop.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\StopSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RollerShade\Up.png" />
+ </ItemGroup>
+ <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>
+ <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>
<ItemGroup>
<ProjectReference Include="..\DroidLib\DroidLib.csproj">
@@ -574,4 +675,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>
\ No newline at end of file
+</Project>
--
Gitblit v1.8.0