合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -48,7 +48,7 @@
        public ESVideoInfo esVideoInfo;

        /// <summary>
        /// 
        /// 暂时没用
        /// </summary>
        public void InitESVideoSDK()
        {
@@ -58,12 +58,28 @@
        /// <summary>
        /// 监控页面
        /// </summary>
<<<<<<< HEAD
        /// <param name="mESVideoInfo">丰林监视所需相关参数</param>
        public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
=======
        /// <param name="mESVideoInfo"></param>
        public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo, string interphoneType)
>>>>>>> origin/CJL-LC
        {
            this.esVideoInfo = mESVideoInfo;
            int roomID = 0;
            int.TryParse(mESVideoInfo.roomno, out roomID);
<<<<<<< HEAD
            ESOnMonitorViewController vc = new ESOnMonitorViewController();
            vc.MESVideoID = mESVideoInfo.ESVideoUUID;
            vc.MESRoomID =roomID;
            vc.DeviceName = mESVideoInfo.DeviceName;
            //vc.RoomName = mESVideoInfo.RoomName;
            //vc.MESCallDelegate = new OnESCallDelegate(this);
            mOnESCallDelegate = new OnESCallDelegate(this);
            vc.MESCallDelegate = mOnESCallDelegate;
            Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
=======

#if __IOS__
            if (interphoneType == "IMOUVISIAL")
@@ -93,6 +109,7 @@
                //vc.MESCallDelegate = new OnESCallDelegate(this);
                Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
            }
>>>>>>> origin/CJL-LC
#else
            Intent intent = null;
            if (interphoneType == "IMOUVISIAL")
@@ -129,8 +146,13 @@
        /// <summary>
        /// 被呼叫页面
        /// </summary>
<<<<<<< HEAD
        /// <param name="mESVideoInfo">丰林呼叫功能所需相关参数</param>
        public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
=======
        /// <param name="mESVideoInfo"></param>
        public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo, string interphoneType)
>>>>>>> origin/CJL-LC
        {
            this.esVideoInfo = mESVideoInfo;
            int roomID = 0;
@@ -380,6 +402,8 @@
        }

        #endregion
<<<<<<< HEAD
=======

        #region 王赢新接听和开锁接口
        /// <summary>
@@ -451,6 +475,7 @@

        }
        #endregion
>>>>>>> origin/CJL-LC

#if __IOS__
        #region OnESCallDelegate
@@ -460,13 +485,19 @@
        OnESCallDelegate mOnESCallDelegate;

        /// <summary>
        /// 
        /// iOS原生委托事件
        /// </summary>
        public class OnESCallDelegate : ESCallDelegate
        {

            /// <summary>
            /// ESOnVideo
            /// </summary>
            [Weak] ESOnVideo _ESOnVideo;

            /// <summary>
            /// 初始化
            /// </summary>
            /// <param name="mESOnVideo">呼叫相关的参数</param>
            public OnESCallDelegate(ESOnVideo mESOnVideo)
            {
                _ESOnVideo = mESOnVideo;
@@ -620,7 +651,11 @@
    }

    /// <summary>
<<<<<<< HEAD
    /// 丰林监视和呼叫功能所需相关参数
=======
    /// 可视对讲参数对象（仅在最后一步跳转到activity时才调用,为了做兼容这里都数据有点乱，以后有时间再理顺思路优化）
>>>>>>> origin/CJL-LC
    /// </summary>
    public class ESVideoInfo
    {