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 | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index c220b43..4156507 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -148,33 +148,6 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11 Pro Max.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11pro.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
@@ -193,6 +166,33 @@
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688_XS Max.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792_XR.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*2732-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1004.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2008.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*748.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1496.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536-1.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -219,6 +219,7 @@
<BundleResource Include="Resources\Phone\Room\RoomShadow.png" />
<BundleResource Include="Resources\Phone\Room\AddBackground.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainSiphonate.png" />
+ <BundleResource Include="Resources\Phone\Instruct\PanelFreshAir.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorPir.png" />
<BundleResource Include="Resources\Phone\Instruct\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainAutoOpen.png" />
@@ -230,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" />
@@ -327,6 +330,20 @@
<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\SceneCardIcon\8.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\9.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\12.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\13.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\11.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\10.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\4.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\5.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\7.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\6.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\2.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\3.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\1.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\0.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueTwoButtonTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueEightButtonTable.png" />
@@ -343,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" />
@@ -448,7 +467,7 @@
<BundleResource Include="Resources\Phone\DoorLock\UnLockSideslipIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\UndistributeIcon.png" />
<BundleResource Include="Resources\Phone\Logo\Logo.png" />
- <BundleResource Include="Resources\Phone\Logo\2.jpg" />
+ <BundleResource Include="Resources\Phone\Logo\2.png" />
<BundleResource Include="Resources\Phone\Item\Shared.png" />
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
@@ -479,6 +498,7 @@
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Item\LogicMsgIcon.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\NormallyOpen.png" />
<BundleResource Include="Resources\Phone\Item\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Item\UnLockSuccess.png" />
<BundleResource Include="Resources\Phone\Item\GarrisonList.png" />
@@ -515,6 +535,7 @@
<BundleResource Include="Resources\Phone\Item\Point.png" />
<BundleResource Include="Resources\Phone\Item\Search.png" />
<BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />
+ <BundleResource Include="Resources\Phone\Item\Check1.png" />
<BundleResource Include="Resources\Phone\Item\NextSelected.png" />
<BundleResource Include="Resources\Phone\Item\SafetyShortcut_itemSelected.png" />
<BundleResource Include="Resources\Phone\Item\Timer.png" />
@@ -560,6 +581,7 @@
<BundleResource Include="Resources\Phone\Item\MinusSign2Selected.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected1.png" />
<BundleResource Include="Resources\Phone\Item\SceneMsgIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\Check1Selected.png" />
<BundleResource Include="Resources\Phone\Item\FailIcon.png" />
<BundleResource Include="Resources\Phone\Item\Message.png" />
<BundleResource Include="Resources\Phone\Item\FixedPosition.png" />
@@ -575,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" />
@@ -644,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" />
@@ -681,6 +705,7 @@
<BundleResource Include="Resources\Phone\Device\Relay.png" />
<BundleResource Include="Resources\Phone\Device\SensorWaterSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfrared.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAir.png" />
<BundleResource Include="Resources\Phone\Device\Curtain.png" />
<BundleResource Include="Resources\Phone\Device\SwitchSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContr.png" />
@@ -691,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" />
@@ -701,6 +727,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtain.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxideSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAirSelected.png" />
<BundleResource Include="Resources\Phone\Device\Repeater.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFour.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfraredSelected2.png" />
@@ -708,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" />
@@ -718,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" />
@@ -745,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" />
@@ -770,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" />
@@ -956,6 +988,7 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFourNotPower.png" />
<BundleResource Include="Resources\Phone\RealDevice\CurtainAutoOpen.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorInfrared.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFreshAir.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelCurtain.png" />
@@ -965,6 +998,8 @@
<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" />
<BundleResource Include="Resources\Phone\RealDevice\SensorFire.png" />
@@ -990,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