From 13faa230078dcf13bee96a101849e256c186de6e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 08 四月 2022 10:19:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 637798b..1129e4a 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DAL.Server;
using Shared;
namespace HDL_ON.UI
{
@@ -75,6 +76,26 @@
{
if (UserInfo.Current.unlockTime.AddMinutes(5) > DateTime.Now || UserInfo.Current.appUnlockPasswrod == "" || UserInfo.Current.appUnlockPage.Count == 0)
{
+ if(UserInfo.Current.inCall.AddMinutes(30) > DateTime.Now ||
+ UserInfo.Current.inVideo)
+ {
+ //UserInfo.Current.PushMesLogTime = DateTime.MinValue;
+
+ //var pushMes = new JPushMessageInfo()
+ //{
+ // Title = UserInfo.Current.PushMesTitle,
+ // Content = UserInfo.Current.PushMesMessage,
+ // Extras = UserInfo.Current.PushMesExtras,
+ // messageType = UserInfo.Current.pushMesMessageType,
+ // expantContent = UserInfo.Current.pushMesExpantContent,
+ // HomeId = UserInfo.Current.PushMesHomeId,
+ //};
+ Shared.Application.RunOnMainThread(() =>
+ {
+ HDLCommon.Current.AdjustPushMessage(UserInfo.Current.pushMessageInfo);
+ });
+ }
+
return;
}
}
--
Gitblit v1.8.0