From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 64dab1f..9981784 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -159,6 +159,9 @@
<Reference Include="Xamarin.Android.Support.Core.Utils">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.Utils.dll</HintPath>
</Reference>
+ <Reference Include="Xamarin.Android.Support.Design">
+ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>
+ </Reference>
<Reference Include="Xamarin.Android.Support.Fragment">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Fragment.dll</HintPath>
</Reference>
@@ -1296,6 +1299,15 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\sensor0.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\SeekBarIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn_2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn2.png" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
--
Gitblit v1.8.0