From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 152 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 125 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index db7596b..59a996e 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -19,6 +19,11 @@
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
+ <AndroidKeyStore>true</AndroidKeyStore>
+ <AndroidSigningKeyStore>C:\Users\admin\AppData\Local\Xamarin\Mono for Android\Keystore\HDL Home\HDL Home.keystore</AndroidSigningKeyStore>
+ <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
+ <AndroidSigningKeyAlias>HDL Home</AndroidSigningKeyAlias>
+ <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -33,7 +38,9 @@
<AndroidTlsProvider>btls</AndroidTlsProvider>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+ <AndroidSupportedAbis />
<AndroidDexTool>d8</AndroidDexTool>
+<AndroidKeyStore></AndroidKeyStore>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,10 +64,6 @@
<Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.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>
</Reference>
@@ -79,18 +82,14 @@
<Reference Include="Microsoft.AppCenter.Crashes.Android.Bindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll</HintPath>
</Reference>
- <Reference Include="MQTTnet, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <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.Smartrefresh">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.TouchID">
<HintPath>..\Shared\DLL\Android\Shared.Droid.TouchID.dll</HintPath>
@@ -110,11 +109,8 @@
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
- <Reference Include="MQTTnet.Core">
- <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>
- </Reference>
<Reference Include="MQTTnet">
- <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.dll</HintPath>
+ <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
@@ -173,6 +169,9 @@
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ </Reference>
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
@@ -184,6 +183,18 @@
</Reference>
<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="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>
+ <Reference Include="Shared.Droid">
+ <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -434,7 +445,6 @@
<AndroidAsset Include="Assets\Phone\Item\Add_Category.png" />
<AndroidAsset Include="Assets\Phone\Item\Add_GW.png" />
<AndroidAsset Include="Assets\Phone\Item\Back.png" />
- <AndroidAsset Include="Assets\Phone\Item\BottomShadow.png" />
<AndroidAsset Include="Assets\Phone\Item\CancelIcon.png" />
<AndroidAsset Include="Assets\Phone\Item\Category_FunctionBG.png" />
<AndroidAsset Include="Assets\Phone\Item\Category_FunctionBGSelected.png" />
@@ -536,11 +546,35 @@
<AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />
<AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrison.png" />
<AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" />
- <AndroidAsset Include="Assets\Phone\SceneIcon\1.png" />
- <AndroidAsset Include="Assets\Phone\SceneIcon\2.png" />
- <AndroidAsset Include="Assets\Phone\SceneIcon\3.png" />
- <AndroidAsset Include="Assets\Phone\SceneIcon\4.png" />
<AndroidAsset Include="Assets\Phone\Account\Back.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\Delaying.png" />
+ <AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />
+ <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />
+ <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />
+ <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\2.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\3.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\4.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\5.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\6.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\7.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\8.jpg" />
+ <AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />
+ <AndroidAsset Include="Assets\Phone\Room\List.png" />
+ <AndroidAsset Include="Assets\Phone\Room\Humidity.png" />
+ <AndroidAsset Include="Assets\Phone\Room\Temperature.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\Background.png" />
+ <AndroidAsset Include="Assets\Phone\Room\AddBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Logo\2.jpg" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut.png" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_background.png" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_itemSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Item\SafetyShortcut_item.png" />
+ <AndroidAsset Include="Assets\Phone\Item\ProgressBubbles.png" />
+ <AndroidAsset Include="Assets\Phone\Room\IconBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Room\IconSelectedBackground.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />
@@ -1029,12 +1063,6 @@
<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>
@@ -1199,6 +1227,75 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\AC\SwingBackground.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\NowAcctionTip.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\Safety.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\Item\MessageManagement.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\MessageManagementSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Account\Back.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AutoBackup.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\2.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\3.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\4.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\5.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\6.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\7.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\8.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Assets\Phone\RoomIcon\" />
+ </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')" />
@@ -1227,4 +1324,5 @@
<Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
-</Project>
\ No newline at end of file
+ <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+</Project>
--
Gitblit v1.8.0