From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 14 九月 2022 15:50:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc --- HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs index 1129e4a..ccdeeb4 100644 --- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs +++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs @@ -1,5 +1,4 @@ 锘縰sing System; -using HDL_ON.DAL.Server; using Shared; namespace HDL_ON.UI { @@ -76,7 +75,7 @@ { if (UserInfo.Current.unlockTime.AddMinutes(5) > DateTime.Now || UserInfo.Current.appUnlockPasswrod == "" || UserInfo.Current.appUnlockPage.Count == 0) { - if(UserInfo.Current.inCall.AddMinutes(30) > DateTime.Now || + if (UserInfo.Current.inCall.AddMinutes(30) > DateTime.Now || UserInfo.Current.inVideo) { //UserInfo.Current.PushMesLogTime = DateTime.MinValue; -- Gitblit v1.8.0