From ddbf195df596cf94bf77b7e38a659cb5d14b3f95 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 十一月 2019 17:48:08 +0800
Subject: [PATCH] 优化门锁类型查找方式（请合并最新代码）
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 6956896..26187ee 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -39,7 +39,8 @@
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidDexTool>d8</AndroidDexTool>
- <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <AndroidKeyStore></AndroidKeyStore>
+ <AndroidSigningKeyStore>/Users/hdl/Library/Developer/Xamarin/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -53,7 +54,6 @@
<MandroidI18n>cjk</MandroidI18n>
<DefineConstants>Android,Release</DefineConstants>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
- <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
</PropertyGroup>
@@ -93,12 +93,6 @@
<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">
- <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
- </Reference>
- <Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.TouchID">
<HintPath>..\Shared\DLL\Android\Shared.Droid.TouchID.dll</HintPath>
</Reference>
@@ -108,9 +102,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>
@@ -192,6 +183,22 @@
<Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Json" />
+ <Reference Include="Shared.Droid">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.Smartrefresh">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Application.cs" />
--
Gitblit v1.8.0