From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index fefe533..d31baff 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -66,8 +66,14 @@
<AndroidUseAapt2>false</AndroidUseAapt2>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AndriodBluetoothLibrary">
+ <HintPath>..\AndriodBluetooth\bin\Debug\AndriodBluetoothLibrary.dll</HintPath>
+ </Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
+ </Reference>
+ <Reference Include="DroidLib">
+ <HintPath>..\DroidLib\bin\Debug\DroidLib.dll</HintPath>
</Reference>
<Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
@@ -1349,12 +1355,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\Safety.png" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\DroidLib\DroidLib.csproj">
- <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>
- <Name>DroidLib</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\MessageManagement.png" />
@@ -2691,6 +2691,36 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\airqualityselected.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\echartsNew.html" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\20190126.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\bmap.min.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\china.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\dataTool.min.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\echarts-all.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\echarts-gl.min.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\echarts.min.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\ecStat.min.js" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Echarts\js\world.js" />
+ </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