Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -109,7 +109,16 @@
            }else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
                ////全视通
                //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
            } else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                //全视通监视
                NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
                Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
                //HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
            }
            else
            {
@@ -120,7 +129,7 @@
            if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
            {
                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
         

                //=========乐橙==========
                intent.PutExtra("Type", 0);
                intent.PutExtra("callId", mESVideoInfo.callId);
@@ -147,24 +156,27 @@
                intent.PutExtra("callId", mESVideoInfo.callId);
                intent.PutExtra("Type", 0);

               


                Shared.Application.Activity.StartActivity(intent);
            }
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.HDL.ToString());
            }
            else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000";
                mESVideoInfo.deviceSipAccount = sip_account;
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString());
            }
            else
            {
                HDLUtils.WriteLine("未对接，不支持监视");
            }

          

#endif
            }
        }

        /// <summary>
        /// 被呼叫页面
@@ -296,21 +308,12 @@
                intent.PutExtra("callId", mESVideoInfo.callId);
                intent.PutExtra("Type", 1);

               


                Shared.Application.Activity.StartActivity(intent);
            }
            else
            {
                HDLUtils.WriteLine("未支持的可视对讲类型");

            }

         

         

            #endregion
#endif
        }
@@ -822,6 +825,16 @@
        /// 设备sip账号 interphoneType是HDL时才会有值
        /// </summary>
        public string deviceSipAccount;
        /// <summary>
        /// spk
        /// </summary>
        public string spk="";

        //========================全视通==========================
        /// <summary>
        /// 设备编号，相当于全视通的LocalDirectory字段
        /// </summary>
        public string deviceCode;
    }


@@ -865,7 +878,10 @@
        /// 狄耐克 HDL Linphone
        /// </summary>
        HDL,

        /// <summary>
        /// 全视通对讲
        /// </summary>
        FREEVIEW,

    }
}