From dc2e0d5b2b06acb2c27c853911faeafbafaa79fa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 01 四月 2022 09:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-hxb' into release0123
---
HDL-ON_Android/LeChengVideoActivity.cs | 7 ++++---
DLL/LC/Android/Shared.Droid.LCVideoSDK.dll | 0
HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll b/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
index b67911f..abd06cf 100644
--- a/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
+++ b/DLL/LC/Android/Shared.Droid.LCVideoSDK.dll
Binary files differ
diff --git a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
index 68073cc..cbf292c 100644
--- a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
@@ -256,7 +256,7 @@
d.Add("callStatus", "RECEIVED");//鍙敤鍊�:MISSED,RECEIVED,REJECT
// d.Add("callDuration", Time);//閫氳瘽鏃堕暱锛堢锛�
d.Add("interphoneTypeEnum", "IMOUVISIAL");//鍙敤鍊�:FLVI,IMOUVISIAL
- string jsonString = HttpUtil.GetSignRequestJson(d);
+ string jsonString = HttpUtil.GetSignRequestJson(d);
string url = "/home-wisdom/platform/imou/updateCallStatus";
ResponsePackNew response = HttpUtil.RequestHttpsPost(url, jsonString);
diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index b1e8ad2..4c04acd 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -20,6 +20,7 @@
using Com.Lechange.Opensdk.Listener;
using Com.Lechange.Opensdk.Media;
using HDL_ON;
+using Com.Lechange.Opensdk.Utils;
using HDL_ON.DAL.Server;
using HDL_ON_Android.LeChengView.Form;
using Java.IO;
@@ -130,9 +131,9 @@
}else {
URL = URL_LC_CHINA;
}
-
- InitParams initParams = new InitParams(this, URL, AccessToken);
+ InitParams initParams = new InitParams(this, URL, AccessToken);
LCOpenSDK_Api.InitOpenApi(initParams);
+ LogUtils.OpenLog();
}
/// <summary>
@@ -172,7 +173,7 @@
LCOpenSDK_Talk.Listener = new AudioTalkerListener();//璁剧疆瀵硅鐩戝惉
//2021-10-29 瀵硅璇锋眰绫诲瀷锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk
string talkType = "talk";
- if (Type == 1)//0鐩戞帶锛�1瀵硅
+ //if (Type == 1)//0鐩戞帶锛�1瀵硅
{
talkType = "call";
}
--
Gitblit v1.8.0