From adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 六月 2020 15:26:46 +0800
Subject: [PATCH] 2020.06.24.01
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 223 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 162 insertions(+), 61 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index e53c63f..a018d8a 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -131,6 +131,7 @@
</Compile>
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
@@ -141,48 +142,57 @@
<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" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160.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" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
+ <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" />
@@ -209,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" />
@@ -216,13 +227,17 @@
<BundleResource Include="Resources\Phone\Instruct\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorTemperatureHumidity.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueTwoButton.png" />
+ <BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelCurtain.png" />
<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\ButtonPanelSimpleMultifunction.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" />
@@ -317,6 +332,21 @@
<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\MiniNightLightDevice.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueTwoButtonTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueEightButtonTable.png" />
@@ -333,12 +363,22 @@
<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" />
<BundleResource Include="Resources\Phone\Navigation\Home.png" />
<BundleResource Include="Resources\Phone\Navigation\Setting.png" />
<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\Xiaoai.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\Nickname.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\SoundIcon.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\Tianmao.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\CheckBoxDef.png" />
+ <BundleResource Include="Resources\Phone\SmartSound\CheckBoxSel.png" />
<BundleResource Include="Resources\Phone\RollerShade\Stop.png" />
<BundleResource Include="Resources\Phone\RollerShade\DownSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Up.png" />
@@ -349,16 +389,20 @@
<BundleResource Include="Resources\Phone\RollerShade\Open.png" />
<BundleResource Include="Resources\Phone\RollerShade\CloseSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Close.png" />
- <BundleResource Include="Resources\Phone\SceneIcon\8.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\9.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\4.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\5.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\7.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\6.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\2.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\3.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\1.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\0.jpg" />
+ <BundleResource Include="Resources\Phone\SceneIcon\8.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\9.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\12.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\13.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\11.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\10.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\4.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\5.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\7.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\6.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\2.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\3.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\1.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\0.png" />
<BundleResource Include="Resources\Phone\BindPic\BindEmptyPic.png" />
<BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
<BundleResource Include="Resources\Phone\BindPic\FreshAirIcon.png" />
@@ -434,7 +478,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\StartBackGroud.png" />
<BundleResource Include="Resources\Phone\Item\Shared.png" />
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
@@ -464,7 +508,9 @@
<BundleResource Include="Resources\Phone\Item\QRCode.png" />
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Item\LogicMsgIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\ColorTemperatureBar.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" />
@@ -501,6 +547,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" />
@@ -546,6 +593,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" />
@@ -557,10 +605,14 @@
<BundleResource Include="Resources\Phone\Item\SelectHouse.png" />
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIconSelected.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\PmPic.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\TemperaturePic.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\HumidityPic.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceselectedbackgroundcolor.png" />
<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" />
@@ -630,7 +682,9 @@
<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\nextIconSone.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\3.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\back.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedtemperature.png" />
@@ -648,15 +702,20 @@
<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\ColorLightTemperatureSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelCurtainSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPir.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironmentSelected.png" />
<BundleResource Include="Resources\Phone\Device\LightSelected.png" />
<BundleResource Include="Resources\Phone\Device\RelaySelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ColorLightTemperatureSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ColorLightTemperature.png" />
<BundleResource Include="Resources\Phone\Device\SensorWaterSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Device\RelayThreeLoad.png" />
@@ -665,8 +724,10 @@
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06CSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSelected2.png" />
<BundleResource Include="Resources\Phone\Device\Relay.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpoint.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" />
@@ -677,6 +738,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" />
@@ -687,6 +749,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" />
@@ -694,17 +757,20 @@
<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" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected.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\ButtonPanelSimpleEnvironment.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" />
@@ -717,34 +783,42 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpoint.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFiveSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DryContactSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected.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\AirQualitySensorEpointSelected2.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\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" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFiveSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected2.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSiphonateSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOne.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\Device\CurtainAutoOpenSelected2.png" />
@@ -756,11 +830,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" />
@@ -768,6 +844,7 @@
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpoint.png" />
@@ -776,6 +853,7 @@
<BundleResource Include="Resources\Phone\Device\SensorWater.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThreeSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAirSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFourSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironmentSelected2.png" />
@@ -809,12 +887,28 @@
<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\RoomIcon\4.JPG" />
- <BundleResource Include="Resources\Phone\RoomIcon\5.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\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\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
<BundleResource Include="Resources\Phone\Account\HidePwd.png" />
@@ -926,39 +1020,46 @@
<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" />
<BundleResource Include="Resources\Phone\RealDevice\Repeater.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorTemperatrueHumidity.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
<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\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorFire.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelThree.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\RealDevice\DimmableLightOneLoad.png" />
<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\MiniGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.png" />
- <BundleResource Include="Resources\Phone\Gateway\RealGateway6.png" />
+ <BundleResource Include="Resources\Phone\Gateway\MiniGateway.png" />
+ <BundleResource Include="Resources\Phone\Gateway\MiniGatewayDirection.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon_6.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway.png" />
- <BundleResource Include="Resources\Phone\Gateway\RealGateway1.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewayInstruct.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\WirelessApGatewaySearching.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\ZigeeLogic\noMode.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\openMode.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\nextIconSone.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