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

wjc

2022-04-08 13faa230078dcf13bee96a101849e256c186de6e

 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);
        }

@@ -60,7 +63,7 @@
            if (jpushExpandData != null && jpushExpandData.messageType != null)
            {
                pushMes.messageType = jpushExpandData.messageType;
                pushMes.expantContent = jpushExpandData.expantContent;
                pushMes.expantContent = jpushExpandData.expantContent;//spk
                pushMes.HomeId = jpushExpandData.homeId;
                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
            }
@@ -70,11 +73,24 @@
            Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
            Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);



            //UserInfo.Current.PushMesTitle = pushMes.Title;

            //UserInfo.Current.PushMesMessage = pushMes.Content;

            //UserInfo.Current.PushMesExtras = pushMes.Extras;

            //UserInfo.Current.pushMesMessageType = pushMes.messageType;

            //UserInfo.Current.pushMesExpantContent = pushMes.expantContent;

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

            UserInfo.Current.pushMessageInfo = pushMes;

            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>