Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-09-14 9eec81850e418a3c16410b4870910bde142b06e3

 HDL_ON/UI/UI0-Public/AppUnlockPage.cs

@@ -1,5 +1,4 @@
using 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;