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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 6350923..3048e17 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -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>
@@ -134,6 +140,8 @@
<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" />
--
Gitblit v1.8.0