From a2d26f15b940c853faaf6d6959b16a6d919cb800 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期三, 27 十一月 2019 19:26:30 +0800 Subject: [PATCH] 请合并最新的代码(完成门锁功能) --- ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj index 85c0865..3185eac 100644 --- a/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj +++ b/ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj @@ -137,14 +137,17 @@ <Reference Include="ZXingNetMobile"> <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\Xamarin.iOS10\ZXingNetMobile.dll</HintPath> </Reference> + <Reference Include="Xamarin.Essentials"> + <HintPath>..\Shared\DLL\IOS\Xamarin.Essentials.dll</HintPath> + </Reference> + <Reference Include="MJRefresh_Xamarin"> + <HintPath>..\Shared\DLL\IOS\MJRefresh_Xamarin.dll</HintPath> + </Reference> <Reference Include="Shared.IOS"> <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath> </Reference> <Reference Include="Shared.IOS.TBL"> <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath> - </Reference> - <Reference Include="Xamarin.Essentials"> - <HintPath>..\Shared\DLL\IOS\Xamarin.Essentials.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -348,6 +351,7 @@ <BundleResource Include="Resources\Phone\AC\Swing_Auto.png" /> <BundleResource Include="Resources\Phone\AC\Swing_AutoSelected.png" /> <BundleResource Include="Resources\Phone\Account\Account.png" /> + <BundleResource Include="Resources\Phone\Account\Back.png" /> <BundleResource Include="Resources\Phone\Account\Cancle.png" /> <BundleResource Include="Resources\Phone\Account\Cat.png" /> <BundleResource Include="Resources\Phone\Account\ChangeSuccess.png" /> @@ -594,6 +598,8 @@ <BundleResource Include="Resources\Phone\Item\ItemUnSelected.png" /> <BundleResource Include="Resources\Phone\Item\MemberNotEsixtPic.png" /> <BundleResource Include="Resources\Phone\Item\Message.png" /> + <BundleResource Include="Resources\Phone\Item\MessageManagement.png" /> + <BundleResource Include="Resources\Phone\Item\MessageManagementSelected.png" /> <BundleResource Include="Resources\Phone\Item\MessageSelected.png" /> <BundleResource Include="Resources\Phone\Item\More.png" /> <BundleResource Include="Resources\Phone\Item\MyHome.png" /> @@ -604,6 +610,7 @@ <BundleResource Include="Resources\Phone\Item\NoFunction.png" /> <BundleResource Include="Resources\Phone\Item\NotAuthority.png" /> <BundleResource Include="Resources\Phone\Item\NotShardPic.png" /> + <BundleResource Include="Resources\Phone\Item\NowAcctionTip.png" /> <BundleResource Include="Resources\Phone\Item\OpenIcon.png" /> <BundleResource Include="Resources\Phone\Item\PersentIcon.png" /> <BundleResource Include="Resources\Phone\Item\PhoneBook.png" /> @@ -621,6 +628,7 @@ <BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" /> <BundleResource Include="Resources\Phone\Item\RoomIconBackgroundSelected.png" /> <BundleResource Include="Resources\Phone\Item\RoomIconSelected.png" /> + <BundleResource Include="Resources\Phone\Item\Safety.png" /> <BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" /> <BundleResource Include="Resources\Phone\Item\ScanQRcodeIconSelected.png" /> <BundleResource Include="Resources\Phone\Item\SceneCard.png" /> -- Gitblit v1.8.0