From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 9d84fa5..3048e17 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>
@@ -84,6 +84,12 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
+ <Reference Include="MJRefresh_Xamarin">
+ <HintPath>..\Shared\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Essentials">
+ <HintPath>..\Shared\DLL\IOS\Xamarin.Essentials.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
@@ -97,7 +103,7 @@
<Version>2.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter">
- <Version>2.6.1</Version>
+ <Version>2.6.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>2.6.1</Version>
@@ -131,14 +137,22 @@
</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\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" />
@@ -253,6 +267,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" />
@@ -372,17 +388,21 @@
<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" />
@@ -407,6 +427,7 @@
<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" />
@@ -423,6 +444,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" />
@@ -448,11 +470,13 @@
<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" />
@@ -714,22 +738,26 @@
<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\CommonDevice.png" />
- <BundleResource Include="Resources\Phone\RealDevice\SensorMotion.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.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\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" />
--
Gitblit v1.8.0