From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期四, 02 四月 2020 13:56:39 +0800 Subject: [PATCH] 2020-04-02-2 --- ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 430 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 428 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj index d340d9a..fd2432c 100644 --- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj +++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj @@ -40,6 +40,8 @@ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <AndroidSupportedAbis /> <AndroidDexTool>d8</AndroidDexTool> + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <AndroidKeyStore></AndroidKeyStore> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -311,7 +313,6 @@ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocks.png" /> <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06C.png" /> <AndroidAsset Include="Assets\Phone\Device\Light.png" /> - <AndroidAsset Include="Assets\Phone\Device\PanelTable.png" /> <AndroidAsset Include="Assets\Phone\Device\Relay.png" /> <AndroidAsset Include="Assets\Phone\Device\RelayEpoint.png" /> <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoad.png" /> @@ -323,7 +324,6 @@ <AndroidAsset Include="Assets\Phone\Device\SensorFire.png" /> <AndroidAsset Include="Assets\Phone\Device\SensorHumidity.png" /> <AndroidAsset Include="Assets\Phone\Device\SensorInfrared.png" /> - <AndroidAsset Include="Assets\Phone\Device\SensorMotion.png" /> <AndroidAsset Include="Assets\Phone\Device\SensorPir.png" /> <AndroidAsset Include="Assets\Phone\Device\SensorTemperature.png" /> <AndroidAsset Include="Assets\Phone\Device\SensorWater.png" /> @@ -1542,6 +1542,432 @@ <ItemGroup> <AndroidAsset Include="Assets\Phone\Guide\WorkRoomIcon.png" /> </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueEight.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueFour.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueTwo.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEight.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironment.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFour.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwo.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueEightButton.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueEnvironment.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueFourButton.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueTwoButton.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEightSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironmentSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFourSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwoSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_3.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_4.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_5.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_3.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_4.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_5.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_6.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\RoomShadow.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Scene\SceneShadow.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Scene\SceneActionGroud.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Room\RoomCardShadow.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpointSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\AirConditionerSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGatewaySelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContrSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\AirSwitchSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEightSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironmentSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFourSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwoSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFourSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOneSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThreeSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwoSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ColorLightSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ConverterSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ConverterZb485Selected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpenSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\CurtainSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonateSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoadSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\DimmableLightSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\DryContactSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06CSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\LightSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\RelayEpointSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\RelaySelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoadSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\RepeaterSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbeeSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxideSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindowSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorFireSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorHumiditySelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorPirSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumiditySelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorWaterSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\Socket1Selected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SwitchSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDeviceSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDeviceSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\1IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\2IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\3IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\4IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\5IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\6IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\7IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\8IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\10IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\11IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\12IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\13IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\14IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\15IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\16IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\17IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\18IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\19IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\20IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\21Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\21IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\21IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\22Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\22IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\22IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\23Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\23IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\23IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\24Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\24IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\24IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\25Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\25IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\25IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\26Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\26IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\26IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\27Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\27IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\27IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\28Icon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\28IconSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\28IconSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\SensorInfraredSelected2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Instruct\PanelCurtain.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DeviceItem\ButtonPanelFangyueEnvironmentBigPic.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DeviceItem\PanelFangyueEightButtonTable.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DeviceItem\PanelFangyueFourButtonTable.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DeviceItem\PanelFangyueTwoButtonTable.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DeviceItem\PanelTable.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelCurtain.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtain.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtainSelected.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\LowPower.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\NormallyOpen.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\NormallyOpenOffline.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\NormallyOpenOn.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\Power40.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\Power60.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\Power80.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\Power100.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\PowerOffline.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\ProgressBackground.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\VolumeIcon.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\DoorLock\VolumeIconOn.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\BindPic\FreshAirIcon.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