From 06802250b4b9041d39d568c1dbe77684075006b2 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 11 三月 2020 10:03:44 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 90 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index b464c2f..e73774a 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -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>
@@ -130,7 +132,58 @@
<Compile Include="Reachability.cs" />
</ItemGroup>
<ItemGroup>
- <BundleResource Include="Resources\Language.ini" />
+ <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" />
+ <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>
+ <ItemGroup>
<BundleResource Include="Resources\Phone\Guide\RightIcon.png" />
<BundleResource Include="Resources\Phone\Guide\LeftIcon.png" />
<BundleResource Include="Resources\Phone\Guide\Finger.png" />
@@ -141,6 +194,7 @@
<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" />
@@ -150,6 +204,7 @@
<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" />
@@ -158,6 +213,8 @@
<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" />
@@ -166,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" />
@@ -254,6 +313,7 @@
<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" />
@@ -568,6 +628,7 @@
<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" />
@@ -586,7 +647,9 @@
<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" />
@@ -606,8 +669,11 @@
<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" />
@@ -629,6 +695,9 @@
<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" />
@@ -637,14 +706,17 @@
<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" />
@@ -663,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" />
@@ -685,7 +767,9 @@
<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" />
@@ -740,13 +824,17 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFour.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\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" />
@@ -761,58 +849,7 @@
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
- </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" />
- <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" />
+ <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