From b7b3e92bed9c4553e30e2901a1877f088a5f8823 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 04 十一月 2019 17:20:52 +0800
Subject: [PATCH] 2019.11.4
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 022e7a4..18b1794 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>
@@ -91,9 +96,6 @@
<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>
@@ -159,6 +161,12 @@
</Reference>
<Reference Include="Shared.Droid">
<HintPath>..\Shared\DLL\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.AppCompat">
+ <HintPath>..\..\..\..\Downloads\Shared.Dll-2019-10-29\Shared.Droid\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -545,6 +553,18 @@
<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" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DroidLib\DroidLib.csproj">
--
Gitblit v1.8.0