From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL-ON_Android/HDL-ON_Android.csproj | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 28741b6..3168eb9 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -64,6 +64,7 @@
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
+ <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="Shared.Droid.JPush">
@@ -167,14 +168,20 @@
<Reference Include="Square.OkIO">
<HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
</Reference>
- <Reference Include="ys">
- <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLLinphone">
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.LCVideoSDK">
<HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
+ </Reference>
+ <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>
@@ -200,6 +207,10 @@
<Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
<Compile Include="LeChengVideoActivity.cs" />
<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" />
@@ -210,6 +221,10 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -441,6 +456,33 @@
</SubType>
<Generator>
</Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\activity_splash.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\dialog_background2.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\btn_agree.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\btn_disagree.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ <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>
</ItemGroup>
<ItemGroup>
@@ -1308,6 +1350,7 @@
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
+ <AndroidNativeLibrary Include="libs\arm64-v8a\libelianjni.so" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
@@ -1387,6 +1430,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