From 675df74cdd4103ffdcbfa0a6ccfc105fd61af15a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 十月 2021 15:44:18 +0800
Subject: [PATCH] 2021-10-29 1.更新乐橙 AndroidSDK
---
HDL-ON_Android/HDL-ON_Android.csproj | 20 ++++++--------------
HDL-ON_Android/LeChengVideoActivity.cs | 8 +++++++-
/dev/null | 0
DLL/LC/Android/Shared.Droid.LCVideoSDK.dll | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 15 ++++++++++-----
5 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 02e9a09..e40466e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,17 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.ED470421-805C-4716-A37A-2F00FD3DF71D" />
<MonoDevelop.Ide.Workbench>
+ <Files>
+ <File FileName="HDL-ON_Android/LeChengVideoActivity.cs" Line="166" Column="35" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_iOS" expanded="True" selected="True">
- <Node name="References" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="References" expanded="True">
+ <Node name="Shared.Droid.LCVideoSDK" selected="True" />
+ </Node>
</Node>
</Node>
</State>
@@ -19,7 +24,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll b/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
new file mode 100644
index 0000000..b67911f
--- /dev/null
+++ b/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 57f2aa5..fd2686f 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -61,7 +61,6 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
- <AndroidKeyStore>True</AndroidKeyStore>
<AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
@@ -163,9 +162,6 @@
<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>
@@ -177,6 +173,9 @@
</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>
</ItemGroup>
<ItemGroup>
@@ -1310,16 +1309,6 @@
</ItemGroup>
<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" />
@@ -1397,6 +1386,9 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
<ItemGroup />
+ <ItemGroup>
+ <Folder Include="libs\arm64-v8a\" />
+ </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.
diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index 94cae4b..2d2a0cc 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -159,8 +159,14 @@
{
CloseAudio();// 鍏抽棴Audio
LCOpenSDK_Talk.Listener = new AudioTalkerListener();//璁剧疆瀵硅鐩戝惉
+ //2021-10-29 瀵硅璇锋眰绫诲瀷锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk
+ string talkType = "talk";
+ if (Type == 1)//0鐩戞帶锛�1瀵硅
+ {
+ talkType = "call";
+ }
// 瀵硅鍙傛暟
- LCOpenSDK_ParamTalk paramTalk = new LCOpenSDK_ParamTalk(AccessToken, DeviceId, -1, Psk, PlayToken, true);
+ LCOpenSDK_ParamTalk paramTalk = new LCOpenSDK_ParamTalk(AccessToken, DeviceId, -1, Psk, PlayToken, true, talkType);
LCOpenSDK_Talk.PlayTalk(paramTalk);
}
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so b/HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so
deleted file mode 100644
index 426d9a0..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libGMCrypto.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so b/HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so
deleted file mode 100644
index 1c970f7..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libLCOpenApiClient.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so b/HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so
deleted file mode 100644
index 29b0cd2..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libLechangeSDK.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so b/HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so
deleted file mode 100644
index 4f557b3..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libSmartConfig.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so b/HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so
deleted file mode 100644
index bb7fb84..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libSoftAPConfig.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so b/HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so
deleted file mode 100644
index e786702..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libconfigsdk.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so b/HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so
deleted file mode 100644
index ab79e66..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libgnustl_shared.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libjcore127.so b/HDL-ON_Android/libs/armeabi-v7a/libjcore127.so
deleted file mode 100644
index d5fa49f..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libjcore127.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so b/HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so
deleted file mode 100644
index ee4b507..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libjninetsdk.so
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so b/HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so
deleted file mode 100644
index 7c759a1..0000000
--- a/HDL-ON_Android/libs/armeabi-v7a/libnetsdk.so
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0