2024年07月25日17:33:40

mac

2024-07-25 f9181a9c8125136f597add7c30cb2ff508d54ba7

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -112,9 +112,8 @@
            } 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);
                //NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
            }
            else
            {
@@ -164,6 +163,7 @@
            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());
            }
@@ -214,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())
            {
@@ -279,8 +285,21 @@
                        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,
                                HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);

                            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;
@@ -817,6 +836,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时才会有值