From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 220 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index a8bdd9b..4e7d5db 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -39,6 +39,10 @@
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidDexTool>d8</AndroidDexTool>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <BundleAssemblies>false</BundleAssemblies>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -53,15 +57,22 @@
<MandroidI18n>cjk</MandroidI18n>
<DefineConstants>Android,Release</DefineConstants>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <BundleAssemblies>false</BundleAssemblies>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
</PropertyGroup>
<ItemGroup>
- <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 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="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>
+ <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="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>
@@ -108,14 +119,8 @@
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
- <Reference Include="MQTTnet.Core">
- <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>
- </Reference>
<Reference Include="MQTTnet">
<HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
- </Reference>
- <Reference Include="BouncyCastle.Crypto">
- <HintPath>..\packages\BouncyCastle.Crypto.dll.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>
@@ -183,13 +188,19 @@
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
- <Reference Include="ZXing.Net.Mobile.Core, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="BouncyCastle.Crypto">
+ <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.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>
- <Reference Include="zxing.portable, Version=0.16.2.0, Culture=neutral, PublicKeyToken=830ae994e36ac27d, processorArchitecture=MSIL">
+ <Reference Include="zxing.portable">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\zxing.portable.dll</HintPath>
</Reference>
- <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ZXingNetMobile">
<HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>
</Reference>
</ItemGroup>
@@ -1331,12 +1342,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" />
@@ -2517,6 +2522,202 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\TransferOfResidenceIcon.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon16.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SmartSound\Sibici.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\ReplaceIconSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon12.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon13.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon15.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Airer216.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\AirerFunPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\AirerOnrange108.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DetailAirerPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DisinfectOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DisinfectSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Down.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DownOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Dry.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\DryOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\FunctionPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\LightOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\LightSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Stop.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\StopOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Up.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\UpOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\Wind.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Airer\WindOffline.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\Airer.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirerSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirerSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorSelected2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\AddFaceIDTipPic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\faceId.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\DoorLock\faceIdOn.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\Airer.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Instruct\AirQualitySensor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\Airer.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Video\VideoQRCodeBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Video\VideoTempPwdBackground.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RealDevice\AirQualitySensor.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\CO2Pic.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\Led.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LED72.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LED84.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LEDLogic1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\LedSelected.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\light.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\AirQualitySensor\lightOn.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\airquality.png" />
+ </ItemGroup>
+ <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>
+ <ItemGroup>
+ <ProjectReference Include="..\DroidLib\DroidLib.csproj">
+ <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>
+ <Name>DroidLib</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\AndriodBluetooth\AndriodBluetooth.csproj">
+ <Project>{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}</Project>
+ <Name>AndriodBluetooth</Name>
+ </ProjectReference>
+ </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