From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期二, 30 八月 2022 09:37:38 +0800 Subject: [PATCH] 合并了IOS的代码 --- ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj index 76bbdda..cb88ecb 100644 --- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj +++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj @@ -68,15 +68,6 @@ <AndroidSigningKeyStore>/Users/liaoshaosheng/Desktop/璇佷功/Evoyo Home.keystore</AndroidSigningKeyStore> </PropertyGroup> <ItemGroup> - <Reference Include="LeakCanary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.dll</HintPath> - </Reference> - <Reference Include="LeakCanary.Analyzer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Analyzer.dll</HintPath> - </Reference> - <Reference Include="LeakCanary.Watcher, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.Watcher.dll</HintPath> - </Reference> <Reference Include="Shared.Droid"> <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath> </Reference> @@ -150,10 +141,7 @@ <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath> </Reference> <Reference Include="BouncyCastle.Crypto"> - <HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath> - </Reference> - <Reference Include="FastAndroidCamera"> - <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath> + <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath> </Reference> <Reference Include="Microsoft.AppCenter.Android.Bindings"> <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath> @@ -173,6 +161,12 @@ <Reference Include="Microsoft.AppCenter.Analytics"> <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath> </Reference> + <Reference Include="MQTTnet"> + <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath> + </Reference> + <Reference Include="FastAndroidCamera"> + <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath> + </Reference> <Reference Include="ZXing.Net.Mobile.Core"> <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXing.Net.Mobile.Core.dll</HintPath> </Reference> @@ -181,9 +175,6 @@ </Reference> <Reference Include="ZXingNetMobile"> <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath> - </Reference> - <Reference Include="MQTTnet"> - <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -2708,6 +2699,10 @@ <Project>{06B9C874-B9B2-4417-8280-B321F966E46B}</Project> <Name>Shared.Droid.JPush</Name> </ProjectReference> + <ProjectReference Include="..\AndroidBluetooth\AndroidBluetooth.csproj"> + <Project>{ECD67F44-FA96-415A-8BC0-27B14A88C68A}</Project> + <Name>AndroidBluetooth</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Folder Include="JPush\" /> -- Gitblit v1.8.0