2.4.2Google

wxr

2023-11-23 90d4fdb42a7f4818897ff76def0a151a99d2d9e1

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -108,7 +108,7 @@
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, interphoneType);
                //HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, interphoneType);
            } else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                //全视通监视
@@ -140,16 +140,16 @@
            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);



@@ -158,13 +158,14 @@
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.HDL.ToString());
                //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());
                //string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000";

                //mESVideoInfo.deviceSipAccount = sip_account;
                //HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString());
            }
            else
            {
@@ -213,8 +214,14 @@
                //2.设置萤石子账号的AccessToken到SDK
                EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(mESVideoInfo.Lc_AccessToken);
                //3.打开视频播放页面
                EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
                string currentTimeStr = Utlis.GetTimestamp();   // 当前时间

                if (string.IsNullOrEmpty(mESVideoInfo.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(mESVideoInfo.currentTime)) > 30000) {    // 超时30s
                    EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
                }
                else {
                    EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial, mESVideoInfo.msgId);
                }
            }
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
@@ -278,8 +285,20 @@
                        bundle.PutString("HomeId", mESVideoInfo.HomeId);
                        bundle.PutString("DeviceSerial", mESVideoInfo.DeviceSerial);
                        intent.PutExtras(bundle);
                        intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
                        Shared.Application.Activity.StartActivity(intent);
                        //获取萤石token，初始化sdk
                        var result = new HttpServerRequest().EZGetChildToken();
                        if (result.Code == StateCode.SUCCESS)
                        {
                            var ezChildAccessToken = result.Data.ToString();

                            //Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);

                            //Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,
                            //    mESVideoInfo.Lc_DeviceId, mESVideoInfo.DeviceSerial, mESVideoInfo.spk, mESVideoInfo.msgId);
                        }

                        //intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
                        //Shared.Application.Activity.StartActivity(intent);
                    }
                });
                return;
@@ -292,19 +311,19 @@
            }
            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);
                ////待删减不必要参数
                //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
            {
@@ -816,6 +835,14 @@
        /// 设备序列号
        /// </summary>
        public string DeviceSerial = string.Empty;
        /// <summary>
        /// 服务器推送时间
        /// </summary>
        public string currentTime = string.Empty;
        /// <summary>
        /// 消息id
        /// </summary>
        public string msgId = string.Empty;
        //========================HDL SIP==========================
        /// <summary>
        /// 设备sip账号 interphoneType是HDL时才会有值