Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-04-08 13faa230078dcf13bee96a101849e256c186de6e

 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 对讲请求类型，call呼叫，如果不传，默认为talk
            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();
            }
        }