From c47c3ec2488961b3a006aaebcb03dba582f8b19b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 12 三月 2020 17:08:42 +0800
Subject: [PATCH] 2020-03-12-1
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 161 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 143 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 46343c3..e73774a 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG;iOS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>x86_64</MtouchArch>
@@ -30,10 +30,12 @@
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+ <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;iOS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
+ <CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -48,6 +50,7 @@
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
+ <MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -59,11 +62,15 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
+ <MtouchI18n>cjk</MtouchI18n>
+ <DeviceSpecificBuild>true</DeviceSpecificBuild>
+ <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
+ <Reference Include="Xamarin.iOS" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
<Reference Include="Shared.IOS">
@@ -79,10 +86,9 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
- <Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
<PackageReference Include="MQTTnet">
<Version>3.0.8</Version>
</PackageReference>
@@ -126,6 +132,14 @@
<Compile Include="Reachability.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
+ <Project>{85F1AF50-75A6-4011-B811-56B32DA77568}</Project>
+ <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" />
@@ -133,7 +147,6 @@
<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" />
@@ -171,20 +184,37 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png" />
</ItemGroup>
<ItemGroup>
- <BundleResource Include="Resources\Language.ini" />
+ <BundleResource Include="Resources\Phone\Guide\RightIcon.png" />
+ <BundleResource Include="Resources\Phone\Guide\LeftIcon.png" />
+ <BundleResource Include="Resources\Phone\Guide\Finger.png" />
+ <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\Room\RoomCardView.png" />
<BundleResource Include="Resources\Phone\Room\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Room\ItemUnSelected.png" />
<BundleResource Include="Resources\Phone\Room\ItemUnSelected_Black.png" />
+ <BundleResource Include="Resources\Phone\Room\RoomCardShadow.png" />
<BundleResource Include="Resources\Phone\Room\FavoriteRoom.png" />
+ <BundleResource Include="Resources\Phone\Room\IconBackground.png" />
+ <BundleResource Include="Resources\Phone\Room\Temperature.png" />
+ <BundleResource Include="Resources\Phone\Room\List.png" />
<BundleResource Include="Resources\Phone\Room\NoNameRoom.png" />
+ <BundleResource Include="Resources\Phone\Room\IconSelectedBackground.png" />
<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\RoomShadow.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\PanelFangyueTwoButton.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\IntelligentLocksH06C.png" />
@@ -193,9 +223,11 @@
<BundleResource Include="Resources\Phone\Instruct\PanelThreeButton.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Instruct\DimmableLightOneLoad.png" />
+ <BundleResource Include="Resources\Phone\Instruct\PanelFangyueEightButton.png" />
<BundleResource Include="Resources\Phone\Instruct\RepeaterZigbee.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorWater.png" />
<BundleResource Include="Resources\Phone\Instruct\DeviceSearch.png" />
+ <BundleResource Include="Resources\Phone\Instruct\PanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelTwoButton.png" />
<BundleResource Include="Resources\Phone\AC\Add.png" />
<BundleResource Include="Resources\Phone\AC\Reduce.png" />
@@ -271,6 +303,17 @@
<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\MenuGroud\TopRightMenu2_6.png" />
<BundleResource Include="Resources\Phone\Center\Abount.png" />
<BundleResource Include="Resources\Phone\Center\ResidenceManagement.png" />
<BundleResource Include="Resources\Phone\Center\Backup.png" />
@@ -278,6 +321,8 @@
<BundleResource Include="Resources\Phone\Center\ImperialCrown.png" />
<BundleResource Include="Resources\Phone\Center\Opinion.png" />
<BundleResource Include="Resources\Phone\Center\DeviceManagement.png" />
+ <BundleResource Include="Resources\Phone\Center\MainBack2.png" />
+ <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\Navigation\CategorySelected.png" />
@@ -368,6 +413,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" />
@@ -383,6 +429,7 @@
<BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
<BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
+ <BundleResource Include="Resources\Phone\Item\PlusSign2.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
<BundleResource Include="Resources\Phone\Item\DownLoad.png" />
@@ -395,23 +442,27 @@
<BundleResource Include="Resources\Phone\Item\DeviceLimitGroundSelected.png" />
<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\InputAccountIcon.png" />
<BundleResource Include="Resources\Phone\Item\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Item\UnLockSuccess.png" />
<BundleResource Include="Resources\Phone\Item\GarrisonList.png" />
+ <BundleResource Include="Resources\Phone\Item\SafetyShortcut_item.png" />
<BundleResource Include="Resources\Phone\Item\ItemUnSelected.png" />
<BundleResource Include="Resources\Phone\Item\NowAcctionTip.png" />
<BundleResource Include="Resources\Phone\Item\VirtualFrame.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon2Selected.png" />
<BundleResource Include="Resources\Phone\Item\FunctionCardView.png" />
<BundleResource Include="Resources\Phone\Item\ForgotPswList.png" />
+ <BundleResource Include="Resources\Phone\Item\ProgressBubbles.png" />
<BundleResource Include="Resources\Phone\Item\Down.png" />
+ <BundleResource Include="Resources\Phone\Item\SafetyShortcut.png" />
<BundleResource Include="Resources\Phone\Item\CollectionSelected.png" />
<BundleResource Include="Resources\Phone\Item\Room.png" />
+ <BundleResource Include="Resources\Phone\Item\SeekBarIcon.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\Remote.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
- <BundleResource Include="Resources\Phone\Item\BottomShadow.png" />
<BundleResource Include="Resources\Phone\Item\Safety.png" />
<BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -430,7 +481,9 @@
<BundleResource Include="Resources\Phone\Item\Search.png" />
<BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />
<BundleResource Include="Resources\Phone\Item\NextSelected.png" />
+ <BundleResource Include="Resources\Phone\Item\SafetyShortcut_itemSelected.png" />
<BundleResource Include="Resources\Phone\Item\Timer.png" />
+ <BundleResource Include="Resources\Phone\Item\PlusSign2Selected.png" />
<BundleResource Include="Resources\Phone\Item\ShardMenu.png" />
<BundleResource Include="Resources\Phone\Item\UnLockFail.png" />
<BundleResource Include="Resources\Phone\Item\ProgressMsg.png" />
@@ -445,6 +498,7 @@
<BundleResource Include="Resources\Phone\Item\SelectFloor_Left.png" />
<BundleResource Include="Resources\Phone\Item\Add_Category.png" />
<BundleResource Include="Resources\Phone\Item\ResidenceIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\SafetyShortcut_background.png" />
<BundleResource Include="Resources\Phone\Item\Tips.png" />
<BundleResource Include="Resources\Phone\Item\DeviceLimitGround.png" />
<BundleResource Include="Resources\Phone\Item\Switch.png" />
@@ -452,6 +506,7 @@
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
<BundleResource Include="Resources\Phone\Item\Floor.png" />
+ <BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -467,12 +522,15 @@
<BundleResource Include="Resources\Phone\Item\FunctionCardViewSelected.png" />
<BundleResource Include="Resources\Phone\Item\More.png" />
<BundleResource Include="Resources\Phone\Item\PswSettion.png" />
+ <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\FailIcon.png" />
<BundleResource Include="Resources\Phone\Item\Message.png" />
<BundleResource Include="Resources\Phone\Item\FixedPosition.png" />
<BundleResource Include="Resources\Phone\Item\GarrisonListSelected.png" />
<BundleResource Include="Resources\Phone\Item\Back.png" />
+ <BundleResource Include="Resources\Phone\Item\RightNext.png" />
<BundleResource Include="Resources\Phone\Item\FunctionViewBG.png" />
<BundleResource Include="Resources\Phone\Item\SceneFunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\SelectHouse.png" />
@@ -480,6 +538,7 @@
<BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.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\logicbj1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\dimmableLight.png" />
@@ -497,6 +556,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\ac.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\curtain.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\doorlock.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nodelay.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
@@ -507,6 +567,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\security1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\delay.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sunrise.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn_2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\temperature.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\AddSelected.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\light_1.png" />
@@ -536,6 +597,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor40.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceunselectedbackgroundcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor21.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\next.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />
@@ -561,49 +623,100 @@
<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\ButtonPanelFangyueEnvironmentSelected.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\PanelFangyueTwoButtonTable.png" />
<BundleResource Include="Resources\Phone\Device\Repeater.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFour.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\ButtonPanelFangyueTwoSelected.png" />
<BundleResource Include="Resources\Phone\Device\ThirdPartyDevice.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorMotion.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.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\ButtonPanelFangyueEight.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFourSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\PanelFangyueEightButtonTable.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\ButtonPanelFangyueEnvironmentBigPic.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\ButtonPanelFangyueTwo.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\Device\PanelFangyueFourButtonTable.png" />
<BundleResource Include="Resources\Phone\Light\DeskLampSelected.png" />
<BundleResource Include="Resources\Phone\Light\ON.png" />
<BundleResource Include="Resources\Phone\Light\Plug.png" />
@@ -622,7 +735,17 @@
<BundleResource Include="Resources\Phone\Safeguard\SafetyShortcutSelected.png" />
<BundleResource Include="Resources\Phone\Safeguard\ProtectionAtHomeSelected.png" />
<BundleResource Include="Resources\Phone\Safeguard\ProtectionAtHome.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_5.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_4.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_4.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_5.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_1.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_3.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_2.png" />
+ <BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_2.png" />
<BundleResource Include="Resources\Phone\Floor\FloorSelected.png" />
+ <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" />
@@ -644,8 +767,11 @@
<BundleResource Include="Resources\Phone\Account\Logo_loginBG.png" />
<BundleResource Include="Resources\Phone\Account\Back.png" />
<BundleResource Include="Resources\Phone\Account\UnhidePwd.png" />
+ <BundleResource Include="Resources\Phone\Scene\SceneShadow.png" />
<BundleResource Include="Resources\Phone\Scene\Delaying.png" />
+ <BundleResource Include="Resources\Phone\Scene\SceneActionGroud.png" />
<BundleResource Include="Resources\Phone\Scene\Selected.png" />
+ <BundleResource Include="Resources\Phone\Scene\Background.png" />
<BundleResource Include="Resources\Phone\Scene\SceneIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\17Icon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\4Icon.png" />
@@ -690,22 +816,30 @@
<BundleResource Include="Resources\Phone\RealDevice\CurtainSiphonate.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorPir.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\RelayThreeLoad.png" />
<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\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.png" />
- <BundleResource Include="Resources\Phone\RealDevice\SensorEmergencyButton.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\CommonDevice.png" />
- <BundleResource Include="Resources\Phone\RealDevice\SensorMotion.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.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\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\WirelessGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway6.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" />
@@ -715,16 +849,7 @@
<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\selectedsensor0.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn2.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn_2.png" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
- <Project>{85F1AF50-75A6-4011-B811-56B32DA77568}</Project>
- <Name>Elian.iOS</Name>
- </ProjectReference>
+ <BundleResource Include="Resources\Language.ini" />
</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