From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 308ee69..4156507 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -231,9 +231,11 @@
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorDoorWindow.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorFire.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelThreeButton.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Instruct\DimmableLightOneLoad.png" />
@@ -358,6 +360,8 @@
<BundleResource Include="Resources\Phone\Center\MainBack1.png" />
<BundleResource Include="Resources\Phone\Center\Admin.png" />
<BundleResource Include="Resources\Phone\Center\SafetyManagement.png" />
+ <BundleResource Include="Resources\Phone\FreshAir\FreshAirRealDevicePic.png" />
+ <BundleResource Include="Resources\Phone\FreshAir\FreshAirPic.png" />
<BundleResource Include="Resources\Phone\Navigation\CategorySelected.png" />
<BundleResource Include="Resources\Phone\Navigation\Category.png" />
<BundleResource Include="Resources\Phone\Navigation\HomeSelected.png" />
@@ -593,6 +597,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\add.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor13.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\noMode.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\dimmableLight.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\athome.png" />
@@ -662,6 +667,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\humidity.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedac.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\openMode.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor21.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\3.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\back.png" />
@@ -710,6 +716,7 @@
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxideSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFour.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorCeilingGasSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumidity.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected2.png" />
@@ -728,7 +735,9 @@
<BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainAutoOpenSelected.png" />
<BundleResource Include="Resources\Phone\Device\Sensor.png" />
+ <BundleResource Include="Resources\Phone\Device\FreshAirEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorCeilingGasSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchSelected.png" />
@@ -738,7 +747,6 @@
<BundleResource Include="Resources\Phone\Device\IntelligentLocks.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected.png" />
- <BundleResource Include="Resources\Phone\Device\SensorEmergencyButton.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SwitchSelected.png" />
@@ -765,12 +773,14 @@
<BundleResource Include="Resources\Phone\Device\AirConditionerSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanel.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwoSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\FreshAirEpointSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGateway.png" />
<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\ButtonPanelOneSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSiphonateSelected2.png" />
<BundleResource Include="Resources\Phone\Device\LightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThreeSelected.png" />
@@ -790,11 +800,13 @@
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoadSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwoSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\FreshAirEpoint.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoadSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThree.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfraredSelected.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
@@ -986,6 +998,7 @@
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\RealDevice\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEight.png" />
@@ -1012,4 +1025,4 @@
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
--
Gitblit v1.8.0