From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 144 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 7bca522..9d84fa5 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -130,51 +130,6 @@
<Compile Include="Reachability.cs" />
</ItemGroup>
<ItemGroup>
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-83.5%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x-1.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-1024.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29-ipad.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828X1792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792X828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png" />
- </ItemGroup>
- <ItemGroup>
<BundleResource Include="Resources\Language.ini" />
<BundleResource Include="Resources\Phone\Room\RoomCardView.png" />
<BundleResource Include="Resources\Phone\Room\ItemSelected.png" />
@@ -187,11 +142,14 @@
<BundleResource Include="Resources\Phone\Room\Room_Rectangle.png" />
<BundleResource Include="Resources\Phone\Room\RoomCardView_Name.png" />
<BundleResource Include="Resources\Phone\Room\Humidity.png" />
+ <BundleResource Include="Resources\Phone\Room\AddBackground.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainSiphonate.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorPir.png" />
<BundleResource Include="Resources\Phone\Instruct\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Instruct\CurtainAutoOpen.png" />
<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\PanelFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
@@ -278,6 +236,16 @@
<BundleResource Include="Resources\Phone\Loading\2.png" />
<BundleResource Include="Resources\Phone\Loading\3.png" />
<BundleResource Include="Resources\Phone\Loading\1.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu1_2.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu1_3.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu1_1.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu1_4.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu1_5.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_3.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_2.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_1.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_5.png" />
+ <BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_4.png" />
<BundleResource Include="Resources\Phone\Center\Abount.png" />
<BundleResource Include="Resources\Phone\Center\ResidenceManagement.png" />
<BundleResource Include="Resources\Phone\Center\Backup.png" />
@@ -375,6 +343,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\Item\Shared.png" />
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
@@ -576,49 +545,88 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\drop-down.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicopen.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor42.png" />
+ <BundleResource Include="Resources\Phone\Device\DimmableLightSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLight.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\Device\SensorPir.png" />
+ <BundleResource Include="Resources\Phone\Device\LightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Device\RelayThreeLoad.png" />
<BundleResource Include="Resources\Phone\Device\CurtainAutoOpen.png" />
+ <BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected.png" />
<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\Curtain.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Device\Socket1.png" />
+ <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\ButtonPanelSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorTemperatureHumidity.png" />
+ <BundleResource Include="Resources\Phone\Device\RelayThreeLoadSelected.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485.png" />
<BundleResource Include="Resources\Phone\Device\Repeater.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumidity.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\CurtainAutoOpenSelected.png" />
<BundleResource Include="Resources\Phone\Device\PanelTable.png" />
<BundleResource Include="Resources\Phone\Device\Sensor.png" />
+ <BundleResource Include="Resources\Phone\Device\RepeaterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\AirSwitchSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\RelaySelected.png" />
+ <BundleResource Include="Resources\Phone\Device\Socket1Selected.png" />
<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\SwitchSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelTwoSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorDoorWindowSelected.png" />
<BundleResource Include="Resources\Phone\Device\Light.png" />
<BundleResource Include="Resources\Phone\Device\ThirdPartyDevice.png" />
<BundleResource Include="Resources\Phone\Device\SensorMotion.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpoint.png" />
+ <BundleResource Include="Resources\Phone\Device\DryContactSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\CurtainSelected.png" />
<BundleResource Include="Resources\Phone\Device\Converter.png" />
<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\AirConditionerZbGatewaySelected.png" />
<BundleResource Include="Resources\Phone\Device\Switch.png" />
+ <BundleResource Include="Resources\Phone\Device\AirConditionerSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanel.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\Device\DryContact.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\ButtonPanelThreeSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06C.png" />
+ <BundleResource Include="Resources\Phone\Device\CurtainSiphonateSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindow.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOne.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperature.png" />
<BundleResource Include="Resources\Phone\Device\SensorFire.png" />
+ <BundleResource Include="Resources\Phone\Device\DimmableLightOneLoadSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorTemperatureSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThree.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorInfraredSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ConverterSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
+ <BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpoint.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbee.png" />
<BundleResource Include="Resources\Phone\Device\SensorWater.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Light\DeskLampSelected.png" />
<BundleResource Include="Resources\Phone\Light\ON.png" />
<BundleResource Include="Resources\Phone\Light\Plug.png" />
@@ -738,6 +746,52 @@
<Name>Elian.iOS</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ImageAsset Include="Assets.xcassets\.DS_Store" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76%402x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%403x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-83.5%402x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%403x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20-ipad.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%403x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%402x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x-ipad.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%403x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x-ipad.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29-ipad.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2688.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828X1792.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792X828.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png" />
+ </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
--
Gitblit v1.8.0