From c8c33200e43f05136eca9fc8ff4942f8def31cc6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 10:45:40 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接
---
HDL-ON_Android/HDL-ON_Android.csproj | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 783fb5d..9c6a8c5 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>
@@ -52,7 +51,6 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
- <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -147,6 +145,9 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
+ <Reference Include="LC_SDK">
+ <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
+ </Reference>
<Reference Include="Square.OkHttp3">
<HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
</Reference>
@@ -155,6 +156,9 @@
</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>
</ItemGroup>
<ItemGroup>
@@ -173,6 +177,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" />
@@ -401,6 +408,30 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Public\MsgIcon\TipSuccessIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconLR.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconLROn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconNull.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconNullOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUD.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUDOn.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ScanGrey.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\FanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\AllCloseIcon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irfan.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
@@ -1212,6 +1243,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" />
@@ -1288,6 +1328,9 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
+ </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" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0