From b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期四, 22 四月 2021 09:25:06 +0800 Subject: [PATCH] 2021-4-22 对接乐橙可视对讲 --- HDL-ON_Android/HDL-ON_Android.csproj | 127 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 2 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index c8c0871..83a5a42 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -33,11 +33,10 @@ <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk> + <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <MandroidI18n>cjk</MandroidI18n> <AndroidDexTool>d8</AndroidDexTool> <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent> - <AndroidLinkMode>None</AndroidLinkMode> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -128,6 +127,27 @@ <Reference Include="AndriodBluetoothLibrary"> <HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath> </Reference> + <Reference Include="cloudp2p"> + <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\cloudp2p.dll</HintPath> + </Reference> + <Reference Include="corelooper"> + <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\corelooper.dll</HintPath> + </Reference> + <Reference Include="crypt"> + <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\crypt.dll</HintPath> + </Reference> + <Reference Include="http"> + <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\http.dll</HintPath> + </Reference> + <Reference Include="VideoLibs"> + <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\VideoLibs.dll</HintPath> + </Reference> + <Reference Include="videophone"> + <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\videophone.dll</HintPath> + </Reference> + <Reference Include="LC_SDK"> + <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -140,6 +160,14 @@ <Compile Include="Other\JLCountrycode.cs" /> <Compile Include="Other\JPush\JPushReceiver.cs" /> <Compile Include="Other\JPush\JPushService.cs" /> + <Compile Include="VideoActivity.cs" /> + <Compile Include="FengLinVideo\Interface\VideoState.cs" /> + <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" /> @@ -221,6 +249,86 @@ <Generator> </Generator> </AndroidResource> + <AndroidResource Include="Resources\drawable\answer.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\back_icon.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\dialog_background.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\hangup.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\mic.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\screenshot_def.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\screenshot_sel.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\screenshot.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\sure_background_def.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\sure_background_sel.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\tip_background.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\unlock_def.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\unlock_sel.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\unlock.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\video_background.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\layout\activity_video_phone.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\layout\dialog_tip.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\layout\fragment_call.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\layout\fragment_monitor.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\values-zh\strings.xml"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> </ItemGroup> <ItemGroup> <Folder Include="Resources\drawable\" /> @@ -259,6 +367,12 @@ </PackageReference> <PackageReference Include="Bugly"> <Version>4.3.1</Version> + </PackageReference> + <PackageReference Include="Xamarin.Android.Support.Constraint.Layout"> + <Version>1.1.0</Version> + </PackageReference> + <PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver"> + <Version>1.1.0</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -929,6 +1043,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> <ProjectReference Include="..\ys\ys.csproj"> -- Gitblit v1.8.0