From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期六, 12 十月 2019 15:45:10 +0800 Subject: [PATCH] 合并门锁,完成住宅管理 --- ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 464 insertions(+), 8 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj index 9e15316..d5962f1 100755 --- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj +++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj @@ -86,6 +86,9 @@ <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.GDMapKit"> + <HintPath>..\Shared\DLL\Shared.Droid.GDMapKit.dll</HintPath> + </Reference> <Reference Include="Shared.Droid.PickerView"> <HintPath>..\Shared\DLL\Shared.Droid.PickerView.dll</HintPath> </Reference> @@ -261,7 +264,7 @@ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOne.png" /> <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThree.png" /> <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwo.png" /> - <AndroidAsset Include="Assets\Phone\Device\ColorDimmableLight.png" /> + <AndroidAsset Include="Assets\Phone\Device\ColorLight.png" /> <AndroidAsset Include="Assets\Phone\Device\Converter.png" /> <AndroidAsset Include="Assets\Phone\Device\ConverterZb485.png" /> <AndroidAsset Include="Assets\Phone\Device\Curtain.png" /> @@ -417,7 +420,7 @@ <AndroidAsset Include="Assets\Phone\Item\SwitchSelected.png" /> </ItemGroup> <ItemGroup> - <AndroidAsset Include="Assets\Phone\Item\Tick.png" /> + <AndroidAsset Include="Assets\Phone\Item\ItemSelected.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\Item\Timer.png" /> @@ -717,12 +720,6 @@ <AndroidAsset Include="Assets\Phone\DoorLock\TypeIcon.png" /> </ItemGroup> <ItemGroup> - <AndroidAsset Include="Assets\Phone\DoorLock\UndistributeIcon1.png" /> - </ItemGroup> - <ItemGroup> - <AndroidAsset Include="Assets\Phone\DoorLock\UndistributeIcon2.png" /> - </ItemGroup> - <ItemGroup> <AndroidAsset Include="Assets\Phone\DoorLock\UnLockBlankPic.png" /> </ItemGroup> <ItemGroup> @@ -743,6 +740,465 @@ <ItemGroup> <AndroidAsset Include="Assets\Phone\DoorLock\VisitorIcon.png" /> </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\ResidenceIcon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Add.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Fan_Height.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Fan_HeightSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Fan_Low.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Fan_LowSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Fan_Middle.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Fan_MiddleSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Group.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_Auto.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_AutoSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_Cool.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_CoolSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_Dry.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_DrySelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_Fan.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_FanSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_Heat.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Mode_HeatSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\OpenOrClose.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\OpenOrCloseSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Path.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\Reduce.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\SelectedFanModeBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\AC\SelectedModeBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Account.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Cancle.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Cat.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\ChangeSuccess.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Code.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\HidePwd.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Logo_loginBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Logo_White.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\Password.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\UnhidePwd.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\Floor.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\FloorSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\10Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\10IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\11Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\11IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\12Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\12IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\13Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\13IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\14Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\14IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\15Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\15IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\16Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\16IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\17Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\17IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\18Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\18IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\19Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\19IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\1Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\1IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\20Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\20IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\2Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\2IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\3Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\3IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\4Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\4IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\5Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\5IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\6Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\6IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\7Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\7IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\8Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\8IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Logo\Logo.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Add_Category.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Add_GW.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Category_FunctionBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Category_FunctionBGSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Collection.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\CollectionSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Drop_Down.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Floor.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\House.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\HouseSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\NoBindGW.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\NoFunction.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\SceneFunctionBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\SelectFloor_Left.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\SelectHouse.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Switch2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Switch2Selected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\VirtualFrame.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\Item\RoomIcon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\BottomShadow.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r0.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r10.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r11.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r12.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r13.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r14.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r15.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r16.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r17.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r18.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r19.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r20.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r21.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r22.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r23.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r24.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r3.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r4.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r5.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r6.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r7.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r8.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\r9.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorHumidity.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorTemperature.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\RealDevice\CommonDevice.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Account\PhoneEmail_White.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Collection1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\CollectionSelected1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\FunctionCardView.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\FunctionCardViewSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\FunctionViewBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Room.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\SceneCard.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Switch1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\SwitchSelected1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Item\Time.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\HomeBG.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\Room_Rectangle.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\RoomCardView.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\RoomCardView_Name.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\Light.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\Socket1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\Switch.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\AddFailedPic.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\DoorlockPicture.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\Switch.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\SwitchOn.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\UndistributeIcon.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