Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

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