From 39e83c7df7608b29a3f359bcc6d9ca9b7ff095f5 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 17 五月 2022 13:54:39 +0800
Subject: [PATCH] 增加预编译条件
---
HDL-ON_Android/HDL-ON_Android.csproj | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 362f0b1..cbc8b17 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -46,6 +46,7 @@
<BundleAssemblies>false</BundleAssemblies>
<AndroidEnableMultiDex>false</AndroidEnableMultiDex>
<AndroidUseAapt2>true</AndroidUseAapt2>
+ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -177,6 +178,12 @@
<Reference Include="ys">
<HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
</Reference>
+ <Reference Include="UMSdkDroid">
+ <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
+ </Reference>
+ <Reference Include="ScanSdk">
+ <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -203,6 +210,8 @@
<Compile Include="Other\HDLONUtils.cs" />
<Compile Include="WebviewActivity.cs" />
<Compile Include="AgreementActivity.cs" />
+ <Compile Include="Zxing\CustomCaptureActivity.cs" />
+ <Compile Include="Zxing\ScanActivity.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\agconnect-services.json" />
@@ -217,6 +226,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg2.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\FunctionOfflineBg.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -469,6 +479,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</AndroidResource>
<AndroidResource Include="Resources\layout\activity_webview.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\activity_zxing_layout.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
@@ -1418,6 +1432,7 @@
<ItemGroup />
<ItemGroup>
<Folder Include="libs\arm64-v8a\" />
+ <Folder Include="Zxing\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
--
Gitblit v1.8.0