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

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -37,6 +37,9 @@
            //2020-12-23 解决点击通知栏打开不了APP问题
            //base.OnNotifyMessageOpened(context, notificationMessage);

            //NotificationManager NotifyManager = (NotificationManager)GetSystemService(Context.NotificationService);
            //NotificationManager notificationManager = NotifyManager;

            OpenNotification(context, notificationMessage);
        }

@@ -77,13 +80,18 @@
            //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(() =>
            {
                HDLCommon.Current.AdjustPushMessage(pushMes);
            });

            if (!MainPage.IsEnterBackground)
            {
                NotificationManager nMgr = (NotificationManager)Shared.Application.Activity.GetSystemService(Context.NotificationService);
                nMgr.CancelAll();
            }
        }



        /// <summary>