From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index dbfa276..4654b66 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -119,7 +119,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
- <Folder Include="Resources\Phone\RoomIcon\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -223,6 +222,8 @@
<BundleResource Include="Resources\Phone\Guide\WorkRoomIcon.png" />
<BundleResource Include="Resources\Phone\Guide\Arrows2.png" />
<BundleResource Include="Resources\Phone\Guide\Arrows1.png" />
+ <BundleResource Include="Resources\Phone\Video\VideoTempPwdBackground.png" />
+ <BundleResource Include="Resources\Phone\Video\VideoQRCodeBackground.png" />
<BundleResource Include="Resources\Phone\Room\RoomCardView.png" />
<BundleResource Include="Resources\Phone\Room\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Room\ItemUnSelected.png" />
@@ -247,6 +248,7 @@
<BundleResource Include="Resources\Phone\Instruct\SensorInfrared.png" />
<BundleResource Include="Resources\Phone\Instruct\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorTemperatureHumidity.png" />
+ <BundleResource Include="Resources\Phone\Instruct\AirQualitySensor.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueTwoButton.png" />
<BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelCurtain.png" />
@@ -254,6 +256,7 @@
<BundleResource Include="Resources\Phone\Instruct\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\Instruct\Airer.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorDoorWindow.png" />
@@ -354,6 +357,25 @@
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_5.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_4.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_6.png" />
+ <BundleResource Include="Resources\Phone\Airer\WindOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Stop.png" />
+ <BundleResource Include="Resources\Phone\Airer\LightSelected.png" />
+ <BundleResource Include="Resources\Phone\Airer\StopOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Up.png" />
+ <BundleResource Include="Resources\Phone\Airer\Dry.png" />
+ <BundleResource Include="Resources\Phone\Airer\Down.png" />
+ <BundleResource Include="Resources\Phone\Airer\DetailAirerPic.png" />
+ <BundleResource Include="Resources\Phone\Airer\DisinfectOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Wind.png" />
+ <BundleResource Include="Resources\Phone\Airer\LightOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\Airer216.png" />
+ <BundleResource Include="Resources\Phone\Airer\DryOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\AirerOnrange108.png" />
+ <BundleResource Include="Resources\Phone\Airer\AirerFunPic.png" />
+ <BundleResource Include="Resources\Phone\Airer\UpOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\DownOffline.png" />
+ <BundleResource Include="Resources\Phone\Airer\DisinfectSelected.png" />
+ <BundleResource Include="Resources\Phone\Airer\FunctionPic.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\8.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\9.png" />
<BundleResource Include="Resources\Phone\SceneCardIcon\12.png" />
@@ -395,6 +417,7 @@
<BundleResource Include="Resources\Phone\Navigation\SettingSelected.png" />
<BundleResource Include="Resources\Phone\SmartSound\PullDown.png" />
<BundleResource Include="Resources\Phone\SmartSound\Xiaodu.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\Sibici.png" />
<BundleResource Include="Resources\Phone\SmartSound\Xiaoai.png" />
<BundleResource Include="Resources\Phone\SmartSound\Nickname.png" />
<BundleResource Include="Resources\Phone\SmartSound\SoundIcon.png" />
@@ -479,6 +502,7 @@
<BundleResource Include="Resources\Phone\DoorLock\DooorLockPicOpen.png" />
<BundleResource Include="Resources\Phone\DoorLock\DelBackground.png" />
<BundleResource Include="Resources\Phone\DoorLock\Password.png" />
+ <BundleResource Include="Resources\Phone\DoorLock\faceIdOn.png" />
<BundleResource Include="Resources\Phone\DoorLock\UnselectedIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\AddIcCardTipPic.png" />
<BundleResource Include="Resources\Phone\DoorLock\Switch.png" />
@@ -495,8 +519,10 @@
<BundleResource Include="Resources\Phone\DoorLock\UnlockFailed.png" />
<BundleResource Include="Resources\Phone\DoorLock\AddPasswordTicPic.png" />
<BundleResource Include="Resources\Phone\DoorLock\AllMethodOn.png" />
+ <BundleResource Include="Resources\Phone\DoorLock\AddFaceIDTipPic.png" />
<BundleResource Include="Resources\Phone\DoorLock\NormallyOpenOn.png" />
<BundleResource Include="Resources\Phone\DoorLock\VolumeIcon.png" />
+ <BundleResource Include="Resources\Phone\DoorLock\faceId.png" />
<BundleResource Include="Resources\Phone\DoorLock\SettingIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\DoorlockIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\SideslipPic.png" />
@@ -607,6 +633,7 @@
<BundleResource Include="Resources\Phone\Item\DeviceLimitGround.png" />
<BundleResource Include="Resources\Phone\Item\Switch.png" />
<BundleResource Include="Resources\Phone\Item\GwSwitchIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\ReplaceIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
<BundleResource Include="Resources\Phone\Item\videoIntercomNext.png" />
@@ -752,6 +779,7 @@
<BundleResource Include="Resources\Phone\Device\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\Device\Socket1Selected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLight.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorSelected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightTemperatureSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected2.png" />
@@ -795,6 +823,7 @@
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtainSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindowSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensor.png" />
<BundleResource Include="Resources\Phone\Device\RelayThreeLoadSelected.png" />
<BundleResource Include="Resources\Phone\Device\DryContactSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtain.png" />
@@ -822,6 +851,7 @@
<BundleResource Include="Resources\Phone\Device\IntelligentLocks.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorEmergencyButton.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
@@ -850,6 +880,7 @@
<BundleResource Include="Resources\Phone\Device\AirConditioner.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLight.png" />
+ <BundleResource Include="Resources\Phone\Device\AirerSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGatewaySelected.png" />
<BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\Switch.png" />
@@ -862,6 +893,7 @@
<BundleResource Include="Resources\Phone\Device\DryContact.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\Airer.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCeilingGas.png" />
@@ -900,6 +932,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorSphericalMotionSelected.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
+ <BundleResource Include="Resources\Phone\Device\AirerSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorMotionSelected2.png" />
@@ -946,6 +979,36 @@
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_1.png" />
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_3.png" />
<BundleResource Include="Resources\Phone\Floor\Floor.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LedSelected.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LED72.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LEDLogic1.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\light.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\Led.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\LED84.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\CO2Pic.png" />
+ <BundleResource Include="Resources\Phone\AirQualitySensor\lightOn.png" />
+ <BundleResource Include="Resources\Phone\RoomIcon\8.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\0.jpg" />
<BundleResource Include="Resources\Phone\Account\Logo_WhiteHome.png" />
<BundleResource Include="Resources\Phone\Account\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
@@ -1062,6 +1125,7 @@
<BundleResource Include="Resources\Phone\RealDevice\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorTemperatureHumidity.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\AirQualitySensor.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelCurtain.png" />
<BundleResource Include="Resources\Phone\RealDevice\Repeater.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
@@ -1070,6 +1134,7 @@
<BundleResource Include="Resources\Phone\RealDevice\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\Airer.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\RealDevice\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
@@ -1083,6 +1148,7 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueTwo.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorWater.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewaySearching.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon.png" />
<BundleResource Include="Resources\Phone\Gateway\MiniGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\MiniGateway.png" />
@@ -1090,37 +1156,20 @@
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon_6.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewayInstruct.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon10.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessApDirection.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon11.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon1.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon13.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon12.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon16.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessApGatewaySearching.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon15.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway11.png" />
<BundleResource Include="Resources\Phone\Gateway\GatewayIcon6.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
- <BundleResource Include="Resources\Phone\RoomIcon\0.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\8.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" />
</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