From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 161 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 112 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 4a0a2a6..b2b460f 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -422,8 +422,8 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\8IconSelected.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon_6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />
@@ -1212,18 +1212,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>
- <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\AutoBackup.png" />
</ItemGroup>
<ItemGroup>
@@ -1231,42 +1219,6 @@
</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" />
- </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>
<AndroidAsset Include="Assets\Phone\Item\MinusSign2.png" />
@@ -1967,6 +1919,117 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\BindPic\FreshAirIcon.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\0.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\4.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\5.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\6.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\7.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\8.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\9.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\11.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\12.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\13.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\7.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\8.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\9.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\10.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\11.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\12.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\13.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\14.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\15.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\16.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\17.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\18.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\19.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\20.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\21.jpg" />
+ </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>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\3.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\4.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\5.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\6.jpg" />
+ </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