From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index e916149..e1e0b7e 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>
@@ -194,6 +192,9 @@
</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>
@@ -550,9 +551,6 @@
<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\2.JPG" />
- <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />
- <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />
<AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />
<AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
<AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />
@@ -567,6 +565,7 @@
<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" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />
@@ -1241,12 +1240,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>
@@ -1259,13 +1252,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" />
@@ -1297,6 +1284,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')" />
--
Gitblit v1.8.0