From 13faa230078dcf13bee96a101849e256c186de6e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 08 四月 2022 10:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL-ON_Android/LeChengVideoActivity.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index 1d26881..4c04acd 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -19,6 +19,8 @@
using Com.Lechange.Opensdk.Device;
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;
@@ -129,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>
@@ -166,11 +168,12 @@
/// </summary>
public void StartTalk()
{
+ UserInfo.Current.inVideo = true;
CloseAudio();// 鍏抽棴Audio
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";
}
@@ -184,6 +187,8 @@
/// </summary>
public void StopTalk()
{
+ UserInfo.Current.inCall = DateTime.MinValue;
+ UserInfo.Current.inVideo = false;
LCOpenSDK_Talk.StopTalk();
LCOpenSDK_Talk.Listener = null;
}
@@ -338,6 +343,7 @@
{
if (v.Equals(ivBack))
{
+ StopTalk();
this.Finish();
}
}
--
Gitblit v1.8.0