From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 206 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 171 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index ccc8183..f15e4cb 100755
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -52,6 +52,12 @@
<MandroidI18n>cjk</MandroidI18n>
<DefineConstants>Android,Release</DefineConstants>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <BundleAssemblies>false</BundleAssemblies>
+ <AndroidDexTool>d8</AndroidDexTool>
+ <AndroidUseAapt2>false</AndroidUseAapt2>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
@@ -418,7 +424,6 @@
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1Selected.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6Selected.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\PhoneImage.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\SearchGateway.png" />
@@ -478,8 +483,6 @@
<AndroidAsset Include="Assets\Phone\Item\OpenIcon.png" />
<AndroidAsset Include="Assets\Phone\Item\PersentIcon.png" />
<AndroidAsset Include="Assets\Phone\Item\PickerColorWheel.png" />
- <AndroidAsset Include="Assets\Phone\Item\PirSensorLightScale.png" />
- <AndroidAsset Include="Assets\Phone\Item\PirSensorLightScaleButton.png" />
<AndroidAsset Include="Assets\Phone\Item\Point.png" />
<AndroidAsset Include="Assets\Phone\Item\ProgressMsg.png" />
<AndroidAsset Include="Assets\Phone\Item\PswSettion.png" />
@@ -537,32 +540,6 @@
<AndroidAsset Include="Assets\Phone\RealDevice\SensorMotion.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorPir.png" />
<AndroidAsset Include="Assets\Phone\RealDevice\SensorWater.png" />
- <AndroidAsset Include="Assets\Phone\Room\HomeBG.png" />
- <AndroidAsset Include="Assets\Phone\Room\r0.png" />
- <AndroidAsset Include="Assets\Phone\Room\r1.png" />
- <AndroidAsset Include="Assets\Phone\Room\r10.png" />
- <AndroidAsset Include="Assets\Phone\Room\r11.png" />
- <AndroidAsset Include="Assets\Phone\Room\r12.png" />
- <AndroidAsset Include="Assets\Phone\Room\r13.png" />
- <AndroidAsset Include="Assets\Phone\Room\r14.png" />
- <AndroidAsset Include="Assets\Phone\Room\r15.png" />
- <AndroidAsset Include="Assets\Phone\Room\r16.png" />
- <AndroidAsset Include="Assets\Phone\Room\r17.png" />
- <AndroidAsset Include="Assets\Phone\Room\r18.png" />
- <AndroidAsset Include="Assets\Phone\Room\r19.png" />
- <AndroidAsset Include="Assets\Phone\Room\r2.png" />
- <AndroidAsset Include="Assets\Phone\Room\r20.png" />
- <AndroidAsset Include="Assets\Phone\Room\r21.png" />
- <AndroidAsset Include="Assets\Phone\Room\r22.png" />
- <AndroidAsset Include="Assets\Phone\Room\r23.png" />
- <AndroidAsset Include="Assets\Phone\Room\r24.png" />
- <AndroidAsset Include="Assets\Phone\Room\r3.png" />
- <AndroidAsset Include="Assets\Phone\Room\r4.png" />
- <AndroidAsset Include="Assets\Phone\Room\r5.png" />
- <AndroidAsset Include="Assets\Phone\Room\r6.png" />
- <AndroidAsset Include="Assets\Phone\Room\r7.png" />
- <AndroidAsset Include="Assets\Phone\Room\r8.png" />
- <AndroidAsset Include="Assets\Phone\Room\r9.png" />
<AndroidAsset Include="Assets\Phone\Room\RoomCardView.png" />
<AndroidAsset Include="Assets\Phone\Room\RoomCardView_Name.png" />
<AndroidAsset Include="Assets\Phone\Room\Room_Rectangle.png" />
@@ -597,12 +574,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\ScanQRcodeIconSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Room\iconBackgroundColor.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Room\iconSelectedBackgroundColor.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\1.png" />
@@ -844,6 +815,171 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\withdrawal.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ItemUnSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewaySearching.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\BottomButtonGround.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\FailIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\DeskLamp.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Light\DeskLampSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\Message.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\MessageSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\MyHome.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\NextSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SelectFloor_Right.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\Shared.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\RoomIconBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\RoomIconBackgroundSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\FavoriteRoom.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\ItemSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\ItemUnSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\ItemUnSelected_Black.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Room\NoNameRoom.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\DelBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\TemPasswordInvisiable.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\GwSwitchIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\GwSwitchIconSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\CurtainAutoOpen.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\DeviceLimitGround.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\DownTriangle.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\UpTriangle.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\DeviceLimitGroundSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\CurtainSiphonate.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorInfrared.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorDoorWindow.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorCarbonMonoxide.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorWater.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\AirSwitchCloudContr.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\RepeaterZigbee.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\AirConditionerZbGateway.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbee.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorFire.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\lockadd.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\selectedhumidity.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\selectedtemperature.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\CreatFloor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\CreatFloorSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\RoomIconSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpointSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\WarningIcon1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AC\Mode_Cool2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AC\Mode_Dry2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AC\Mode_Fan2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AC\Mode_Heat2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\IndoorUnitGround.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\BindPic\BindRoomColor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\BindPic\BindRoomColorOn.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Scene\SceneIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Scene\Selected.png" />
+ </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