From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL-ON_Android/LeChengVideoActivity.cs | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index 4c04acd..1d26881 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -19,8 +19,6 @@
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;
@@ -131,9 +129,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>
@@ -168,12 +166,11 @@
/// </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";
}
@@ -187,8 +184,6 @@
/// </summary>
public void StopTalk()
{
- UserInfo.Current.inCall = DateTime.MinValue;
- UserInfo.Current.inVideo = false;
LCOpenSDK_Talk.StopTalk();
LCOpenSDK_Talk.Listener = null;
}
@@ -343,7 +338,6 @@
{
if (v.Equals(ivBack))
{
- StopTalk();
this.Finish();
}
}
--
Gitblit v1.8.0