wxr
2024-11-01 c0c734d7a84cf7105401878ffc4b64cbb67621d1
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -52,6 +52,10 @@
            this.InitializationAndroidData((isEzChildAccessToken) =>
            {
                if (!isEzChildAccessToken)
                {
                    return;
                }
                this.SunThread(() =>
                {
                    var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
@@ -180,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
                });
            });
        }
@@ -332,6 +342,7 @@
                return lockModels.notAllowedConfigNetworkModels;
            }
        }
        /// <summary>
        /// 门锁推送
        /// </summary>
@@ -358,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);
@@ -391,6 +401,7 @@
            });
        }
        /// <summary>
        /// 更新开锁图标和电池状态
        /// </summary>