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

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -80,7 +80,8 @@
            //UserInfo.Current.pushMesExpantContent = pushMes.expantContent;

            //UserInfo.Current.PushMesHomeId = pushMes.HomeId;

            UserInfo.Current.pushMessageInfo = pushMes;

            UserInfo.Current.inCall = DateTime.Now;

            if (!string.IsNullOrEmpty(pushMes.spk))//自研可视对讲需要记录时间反呼
                UserInfo.Current.inCall = DateTime.Now;



            Shared.Application.RunOnMainThread(() =>
            {