From 18d4b849131c1d44b0a8dc1abee4a57207d1c497 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 11 十一月 2019 17:23:59 +0800
Subject: [PATCH] 2019-11-11-1
---
ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
index 93d3050..4ed9f2f 100644
--- a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
+++ b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj
@@ -127,7 +127,13 @@
<HintPath>..\packages\Microsoft.AppCenter.Crashes.1.14.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Shared.IOS">
- <HintPath>..\Shared\DLL\Shared.IOS.dll</HintPath>
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Essentials">
+ <HintPath>..\Shared\DLL\IOS\Xamarin.Essentials.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -212,12 +218,16 @@
<BundleResource Include="Resources\Phone\AC\Mode_Auto.png" />
<BundleResource Include="Resources\Phone\AC\Mode_AutoSelected.png" />
<BundleResource Include="Resources\Phone\AC\Mode_Cool.png" />
+ <BundleResource Include="Resources\Phone\AC\Mode_Cool2.png" />
<BundleResource Include="Resources\Phone\AC\Mode_CoolSelected.png" />
<BundleResource Include="Resources\Phone\AC\Mode_Dry.png" />
+ <BundleResource Include="Resources\Phone\AC\Mode_Dry2.png" />
<BundleResource Include="Resources\Phone\AC\Mode_DrySelected.png" />
<BundleResource Include="Resources\Phone\AC\Mode_Fan.png" />
+ <BundleResource Include="Resources\Phone\AC\Mode_Fan2.png" />
<BundleResource Include="Resources\Phone\AC\Mode_FanSelected.png" />
<BundleResource Include="Resources\Phone\AC\Mode_Heat.png" />
+ <BundleResource Include="Resources\Phone\AC\Mode_Heat2.png" />
<BundleResource Include="Resources\Phone\AC\Mode_HeatSelected.png" />
<BundleResource Include="Resources\Phone\AC\OpenOrClose.png" />
<BundleResource Include="Resources\Phone\AC\OpenOrCloseSelected.png" />
@@ -241,6 +251,8 @@
<BundleResource Include="Resources\Phone\BindPic\BindEmptyPic.png" />
<BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
<BundleResource Include="Resources\Phone\BindPic\BindRight.png" />
+ <BundleResource Include="Resources\Phone\BindPic\BindRoomColor.png" />
+ <BundleResource Include="Resources\Phone\BindPic\BindRoomColorOn.png" />
<BundleResource Include="Resources\Phone\Center\Abount.png" />
<BundleResource Include="Resources\Phone\Center\Admin.png" />
<BundleResource Include="Resources\Phone\Center\Backup.png" />
@@ -252,6 +264,7 @@
<BundleResource Include="Resources\Phone\Center\SafetyManagement.png" />
<BundleResource Include="Resources\Phone\Device\AirConditioner.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpoint.png" />
+ <BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContr.png" />
@@ -277,6 +290,7 @@
<BundleResource Include="Resources\Phone\Device\RelayEpoint.png" />
<BundleResource Include="Resources\Phone\Device\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Device\Repeater.png" />
+ <BundleResource Include="Resources\Phone\Device\RepeaterZigbee.png" />
<BundleResource Include="Resources\Phone\Device\Sensor.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindow.png" />
@@ -387,21 +401,19 @@
<BundleResource Include="Resources\Phone\FunctionIcon\9Icon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\9IconSelected.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon1.png" />
- <BundleResource Include="Resources\Phone\Gateway\GatewayIcon1Selected.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon6.png" />
- <BundleResource Include="Resources\Phone\Gateway\GatewayIcon6Selected.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway1.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway6.png" />
- <BundleResource Include="Resources\Phone\Gateway\SearchGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewayInstruct.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewaySearching.png" />
- <BundleResource Include="Resources\Phone\Gateway\WiredGatewaySelected.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewayImage.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewayInstruct.png" />
- <BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySelected.png" />
+ <BundleResource Include="Resources\Phone\Instruct\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\Instruct\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainAutoOpen.png" />
+ <BundleResource Include="Resources\Phone\Instruct\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\Instruct\DeviceSearch.png" />
<BundleResource Include="Resources\Phone\Instruct\DimmableLightOneLoad.png" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
@@ -409,6 +421,12 @@
<BundleResource Include="Resources\Phone\Instruct\PanelThreeButton.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelTwoButton.png" />
<BundleResource Include="Resources\Phone\Instruct\RelayThreeLoad.png" />
+ <BundleResource Include="Resources\Phone\Instruct\RepeaterZigbee.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorCarbonMonoxide.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorFire.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorInfrared.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorWater.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
<BundleResource Include="Resources\Phone\Item\Add_Category.png" />
<BundleResource Include="Resources\Phone\Item\Add_GW.png" />
@@ -424,12 +442,17 @@
<BundleResource Include="Resources\Phone\Item\Collection1.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected1.png" />
+ <BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
+ <BundleResource Include="Resources\Phone\Item\CreatFloorSelected.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon2.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon2Selected.png" />
+ <BundleResource Include="Resources\Phone\Item\DeviceLimitGround.png" />
+ <BundleResource Include="Resources\Phone\Item\DeviceLimitGroundSelected.png" />
<BundleResource Include="Resources\Phone\Item\Down.png" />
<BundleResource Include="Resources\Phone\Item\DownLoad.png" />
+ <BundleResource Include="Resources\Phone\Item\DownTriangle.png" />
<BundleResource Include="Resources\Phone\Item\Drop_Down.png" />
<BundleResource Include="Resources\Phone\Item\FailIcon.png" />
<BundleResource Include="Resources\Phone\Item\FixedPosition.png" />
@@ -446,6 +469,7 @@
<BundleResource Include="Resources\Phone\Item\HidenPWD.png" />
<BundleResource Include="Resources\Phone\Item\House.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
+ <BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIcon.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\ItemSelected.png" />
@@ -465,8 +489,6 @@
<BundleResource Include="Resources\Phone\Item\OpenIcon.png" />
<BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
<BundleResource Include="Resources\Phone\Item\PickerColorWheel.png" />
- <BundleResource Include="Resources\Phone\Item\PirSensorLightScale.png" />
- <BundleResource Include="Resources\Phone\Item\PirSensorLightScaleButton.png" />
<BundleResource Include="Resources\Phone\Item\Point.png" />
<BundleResource Include="Resources\Phone\Item\ProgressMsg.png" />
<BundleResource Include="Resources\Phone\Item\PswSettion.png" />
@@ -479,9 +501,9 @@
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackgroundSelected.png" />
+ <BundleResource Include="Resources\Phone\Item\RoomIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIconSelected.png" />
- <BundleResource Include="Resources\Phone\Item\Scene.png" />
<BundleResource Include="Resources\Phone\Item\SceneCard.png" />
<BundleResource Include="Resources\Phone\Item\SceneFunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
@@ -497,15 +519,16 @@
<BundleResource Include="Resources\Phone\Item\Switch2Selected.png" />
<BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />
<BundleResource Include="Resources\Phone\Item\SwitchSelected1.png" />
- <BundleResource Include="Resources\Phone\Item\ThirdPartyDevice.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
<BundleResource Include="Resources\Phone\Item\Timer.png" />
<BundleResource Include="Resources\Phone\Item\Tips.png" />
<BundleResource Include="Resources\Phone\Item\UnHidenPWD.png" />
<BundleResource Include="Resources\Phone\Item\UnLockFail.png" />
<BundleResource Include="Resources\Phone\Item\UnLockSuccess.png" />
+ <BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\UpperTriangle.png" />
<BundleResource Include="Resources\Phone\Item\VirtualFrame.png" />
+ <BundleResource Include="Resources\Phone\Item\WarningIcon1.png" />
<BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
<BundleResource Include="Resources\Phone\Light\DeskLamp.png" />
<BundleResource Include="Resources\Phone\Light\DeskLampSelected.png" />
@@ -546,6 +569,8 @@
<BundleResource Include="Resources\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />
<BundleResource Include="Resources\Phone\Safeguard\WithdrawGarrison.png" />
<BundleResource Include="Resources\Phone\Safeguard\WithdrawGarrisonSelected.png" />
+ <BundleResource Include="Resources\Phone\Scene\SceneIcon.png" />
+ <BundleResource Include="Resources\Phone\Scene\Selected.png" />
<BundleResource Include="Resources\Phone\SceneIcon\1.png" />
<BundleResource Include="Resources\Phone\SceneIcon\2.png" />
<BundleResource Include="Resources\Phone\SceneIcon\3.png" />
@@ -578,6 +603,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\leavehome.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\light.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\light_1.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\lockadd.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj2.png" />
@@ -632,7 +658,6 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\timeparagraph.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\timepoint.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\lockadd.png" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
--
Gitblit v1.8.0