更新极光Sdk531

wxr

2024-11-01 c0c734d7a84cf7105401878ffc4b64cbb67621d1

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs

@@ -47,11 +47,15 @@
        /// android,ios源生添加设备到云端成功后回调方法
        /// 再读取云端的上萤石设备列表
        /// <paramref name="spk"/>spk</param>
        public void SkipAddDeviceActivity(string spk)
        public void SkipAddDeviceActivity(string spk ,Action setAddCallback)
        {

            this.InitializationAndroidData((isEzChildAccessToken) =>
            {
                if (!isEzChildAccessToken)
                {
                    return;
                }
                this.SunThread(() =>
                {
                    var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
@@ -77,15 +81,13 @@

#else
                        HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk, list);
                        HDLEzvizSdk.SetAddCallback(new
                            AndroidIHdlInterface((isBool, serials) =>
                    {
                        if (isBool)
                        {
                            this.GetYingshiDeviceList(serials);
                        }

                    }));
                        HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) => {
                            if (isBool)
                            {
                                this.GetYingshiDeviceList(serials);
                                setAddCallback?.Invoke();
                            }
                        }));
#endif

                    });
@@ -182,13 +184,19 @@
        private void SkipRTVActivity(string deviceSerial, string deviceId, string spk, string msgId)
        {

#if __IOS__
            //打开萤石视频界面
            EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);

            this.InitializationAndroidData((isBools) =>
            {
                this.MainThread(() =>
                {
#if __IOS__
                    EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
#else
            HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity, deviceId, deviceSerial, spk, msgId);
                    HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity, deviceId, deviceSerial, spk, msgId);
#endif
                });
            });



        }
@@ -334,6 +342,7 @@
                return lockModels.notAllowedConfigNetworkModels;
            }
        }

        /// <summary>
        /// 门锁推送
        /// </summary>
@@ -360,22 +369,21 @@
                    {
                        return;
                    }
                    //if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
                    //{
                    //    ///打开视频门锁
                    //    string currentTimeStr = Utlis.GetTimestamp();   // 当前时间
                    if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
                    {
                        ///打开视频门锁
                        string currentTimeStr = Utlis.GetTimestamp();   // 当前时间

                    //    if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
                    //    {    // 超时30s
                    //        this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
                    //    }
                    //    else
                    //    {
                    //        this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
                    //    }
                    //}
                    //else
                    if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
                        if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
                        {    // 超时30s
                            this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
                        }
                        else
                        {
                            this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
                        }
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
                    {
                        //低电量推送
                        this.UpdateDoorLockState(PushMessageType.Alarm);
@@ -393,6 +401,7 @@
            });

        }

        /// <summary>
        /// 更新开锁图标和电池状态
        /// </summary>
@@ -420,12 +429,12 @@
        /// <returns></returns>
        public List<Function> GetVideoDoorLockList()
        {
            //var list = FunctionList.List.GetVideoDoorLockList();
            var list = FunctionList.List.GetVideoDoorLockList();
#if DEBUG
            //list.Add(new Function { name = "视频门锁一", sid = "23456789", spk = SPK.VideoDoorLock });
            //list.Add(new Function { name = "视频门锁二", sid = "2345678922", spk = SPK.VideoDoorLock });
#endif
            return new List<Function>();
            return list;
        }
        #region  --------- 功能文件保存，删除 --------
        /// <summary>