From 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 05 七月 2021 11:23:35 +0800 Subject: [PATCH] 代码合并-温居城 --- HDL-ON_Android/HDL-ON_Android.csproj | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 473becc..f3aab45 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -37,7 +37,6 @@ <MandroidI18n>cjk</MandroidI18n> <AndroidDexTool>d8</AndroidDexTool> <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent> - <AndroidLinkMode>None</AndroidLinkMode> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -156,6 +155,9 @@ <Reference Include="ys"> <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath> </Reference> + <Reference Include="LC_SDK"> + <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -173,6 +175,9 @@ <Compile Include="FengLinVideo\Form\MonitorFragment.cs" /> <Compile Include="FengLinVideo\Form\ReverseCallFragment.cs" /> <Compile Include="FengLinVideo\widget\TipDiaglog.cs" /> + <Compile Include="LeChengVideo\Form\MonitorFragment.cs" /> + <Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" /> + <Compile Include="LeChengVideoActivity.cs" /> </ItemGroup> <ItemGroup> <None Include="Resources\AboutResources.txt" /> @@ -1234,6 +1239,15 @@ <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" /> -- Gitblit v1.8.0