wxr
2024-05-23 c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -137,36 +137,36 @@
                Shared.Application.Activity.StartActivity(intent);
            }
            else if (interphoneType == InterphoneType.FLVI.ToString())
            {
            //else if (interphoneType == InterphoneType.FLVI.ToString())
            //{
                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
                intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
                intent.PutExtra("uuid", mESVideoInfo.uuid);
                intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
                intent.PutExtra("cmtID", mESVideoInfo.cmtID);
                intent.PutExtra("roomno", mESVideoInfo.roomno);
                intent.PutExtra("unitno", mESVideoInfo.unitno);
                intent.PutExtra("HomeID", PirSend.HomeId);
                intent.PutExtra("callId", mESVideoInfo.callId);
                intent.PutExtra("Type", 0);
            //    intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
            //    intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
            //    intent.PutExtra("uuid", mESVideoInfo.uuid);
            //    intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
            //    intent.PutExtra("cmtID", mESVideoInfo.cmtID);
            //    intent.PutExtra("roomno", mESVideoInfo.roomno);
            //    intent.PutExtra("unitno", mESVideoInfo.unitno);
            //    intent.PutExtra("HomeID", PirSend.HomeId);
            //    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, InterphoneType.HDL.ToString());
            }
            else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000";
            //    Shared.Application.Activity.StartActivity(intent);
            //}
            //else if (interphoneType == InterphoneType.HDL.ToString())
            //{
            //    //HDLLinphone 狄耐克
            //    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());
            }
            //    mESVideoInfo.deviceSipAccount = sip_account;
            //    HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString());
            //}
            else
            {
                HDLUtils.WriteLine("未对接,不支持监视");
@@ -268,28 +268,28 @@
                Shared.Application.Activity.StartActivity(intent);
            }
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDL Linphone 狄耐克
            //else if (interphoneType == InterphoneType.HDL.ToString())
            //{
            //    //HDL Linphone 狄耐克
           
            }
            else if (interphoneType == InterphoneType.FLVI.ToString())
            {
                //待删减不必要参数
                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
                intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
                intent.PutExtra("uuid", mESVideoInfo.uuid);
                intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
                intent.PutExtra("cmtID", mESVideoInfo.cmtID);
                intent.PutExtra("roomno", mESVideoInfo.roomno);
                intent.PutExtra("unitno", mESVideoInfo.unitno);
                intent.PutExtra("HomeID", PirSend.HomeId);
                intent.PutExtra("callId", mESVideoInfo.callId);
                intent.PutExtra("Type", 1);
            //}
            //else if (interphoneType == InterphoneType.FLVI.ToString())
            //{
            //    //待删减不必要参数
            //    intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
            //    intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
            //    intent.PutExtra("uuid", mESVideoInfo.uuid);
            //    intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
            //    intent.PutExtra("cmtID", mESVideoInfo.cmtID);
            //    intent.PutExtra("roomno", mESVideoInfo.roomno);
            //    intent.PutExtra("unitno", mESVideoInfo.unitno);
            //    intent.PutExtra("HomeID", PirSend.HomeId);
            //    intent.PutExtra("callId", mESVideoInfo.callId);
            //    intent.PutExtra("Type", 1);
                Shared.Application.Activity.StartActivity(intent);
            }
            //    Shared.Application.Activity.StartActivity(intent);
            //}
            else
            {
                HDLUtils.WriteLine("未支持的可视对讲类型");
@@ -853,7 +853,7 @@
        /// <summary>
        /// 丰林平台
        /// </summary>
        FLVI,
        //FLVI,
        /// <summary>
        /// 大华可视对讲平台
        /// </summary>
@@ -865,11 +865,11 @@
        /// <summary>
        /// 狄耐克 HDL Linphone
        /// </summary>
        HDL,
        //HDL,
        /// <summary>
        /// 全视通对讲
        /// </summary>
        FREEVIEW,
        //FREEVIEW,
    }
}