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 | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 9eacf47..59a996e 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -40,6 +40,7 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidSupportedAbis />
<AndroidDexTool>d8</AndroidDexTool>
+<AndroidKeyStore></AndroidKeyStore>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -108,9 +109,6 @@
</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.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
</Reference>
@@ -185,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>
@@ -435,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" />
@@ -537,6 +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\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" />
@@ -1211,12 +1249,6 @@
<AndroidAsset Include="Assets\Phone\Account\Back.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />
</ItemGroup>
<ItemGroup>
@@ -1229,13 +1261,7 @@
<AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Scene\Delaying.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
@@ -1267,6 +1293,9 @@
<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')" />
@@ -1296,4 +1325,4 @@
<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')" />
<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>
\ No newline at end of file
+</Project>
--
Gitblit v1.8.0