Merge remote-tracking branch 'origin/jpush_tst' into wxr7

wxr

2021-09-07 95a7e380db583108d9716c56fe6d298ca08f8f23

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -7,6 +7,7 @@
using HDL_ON;
using HDL_ON.DAL.Server;
using Shared;
using Android.OS;

namespace HDL_ON_Android
{
@@ -22,6 +23,7 @@
    })]
    public class JPushReceiver : JPushMessageReceiver
    {



        private static string TAG = "JPushReceiver";
        /// <summary>
@@ -67,6 +69,7 @@
            Utlis.WriteLine("PushMes message : " + pushMes.Content);
            Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
            Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);


            Shared.Application.RunOnMainThread(() =>
            {
                HDLCommon.Current.AdjustPushMessage(pushMes);
@@ -79,7 +82,7 @@
        /// </summary>
        /// <param name="pushMes"></param>
        /// <returns></returns>
        ExpandData GetJPushExpandData(JPushMessageInfo pushMes)
        static ExpandData GetJPushExpandData(JPushMessageInfo pushMes)
        {
            try
            {
@@ -149,8 +152,9 @@
        /// </summary>
        /// <param name="context"></param>
        /// <param name="notificationMessage"></param>
        private void OpenNotification(Context context, NotificationMessage notificationMessage)
        public static void OpenNotification(Context context, NotificationMessage notificationMessage)
        {


            try
            {
                var pushMes = new JPushMessageInfo()
@@ -173,14 +177,13 @@
                Utlis.WriteLine("PushMes message : " + pushMes.Content);
                Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
                Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
                Shared.Application.RunOnMainThread(() =>
                {




                    Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);
                    i.SetFlags(ActivityFlags.NewTask);
                    context.StartActivity(i);

                    HDLCommon.Current.AdjustPushMessage(pushMes);
                });
                //解析msg

                AdjustPushMessage(pushMes);


                //Shared.Application.RunOnMainThread(() =>
                //{
@@ -209,6 +212,25 @@
            //    Utlis.WriteLine(ex.ToString());
            //}
        }



        public static void AdjustPushMessage(JPushMessageInfo pushMes)

        {



            new System.Threading.Thread(new System.Threading.ThreadStart(() =>

            {

                while (MainPage.BasePageView == null)

                {

                    System.Threading.Thread.Sleep(300);

                }

                Shared.Application.RunOnMainThread(() =>

                {

                    HDLCommon.Current.AdjustPushMessage(pushMes);

                });

            })).Start();



        }

    }
    
}