2021-11-30 1.修复乐橙Android，没调用拒接接口问题。

JLChen

2021-11-30 efad979b6fae76fb37a4de7e94e6bac0a85cb72c

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -1,27 +1,30 @@

using System;

using Android.App;
using Android.Content;
using CN.Jpush.Android.Api;
using CN.Jpush.Android.Service;
using HDL_ON;
using HDL_ON.DAL.Server;
using Shared;
using Android.OS;

namespace HDL_ON_Android
{
    
{



    [BroadcastReceiver(Enabled = true, Exported = false)]
    [Android.App.IntentFilter(new string[]
    {
        "cn.jpush.android.intent.RECEIVE_MESSAGE"
    },
    Categories=new string[] 
    Categories = new string[]

    {
        "com.hdl.onpro"
    })]
    public class JPushReceiver : JPushMessageReceiver
    {

    {





        private static string TAG = "JPushReceiver";
        /// <summary>
        /// 用户点击打开了通知
@@ -57,22 +60,29 @@
            if (jpushExpandData != null && jpushExpandData.messageType != null)
            {
                pushMes.messageType = jpushExpandData.messageType;
                pushMes.expantContent = jpushExpandData.expantContent;
                pushMes.HomeId = jpushExpandData.homeId;
                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
            }

            Utlis.WriteLine("PushMes title : " + pushMes.Title);
            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);
            });

            HDLCommon.Current.AdjustPushMessage(pushMes);
        }

        }



        /// <summary>
        /// 
        /// </summary>
        /// <param name="pushMes"></param>
        /// <returns></returns>
        ExpandData GetJPushExpandData(JPushMessageInfo pushMes)
        static ExpandData GetJPushExpandData(JPushMessageInfo pushMes)
        {
            try
            {
@@ -142,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()
@@ -157,38 +168,40 @@
                if (jpushExpandData != null && jpushExpandData.messageType != null)
                {
                    pushMes.messageType = jpushExpandData.messageType;
                    pushMes.expantContent = jpushExpandData.expantContent; ;
                    pushMes.HomeId = jpushExpandData.homeId;
                    Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
                }

                Utlis.WriteLine("PushMes title : " + pushMes.Title);
                Utlis.WriteLine("PushMes message : " + pushMes.Content);
                Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
                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);
                });

                //Shared.Application.RunOnMainThread(() =>
                //{
                //    if (Shared.Application.Activity == null)
                //    {
                //        var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);
                //        tempIntent.SetFlags(ActivityFlags.BroughtToFront);
                //        context.StartActivity(tempIntent);

                //        HDLCommon.Current.AdjustPushMessage(pushMes);
                //    }
                //    else
                //    {

                //        (Shared.Application.Activity as BaseActivity).MoveToFront();
                //        HDLCommon.Current.AdjustPushMessage(pushMes);
                //    }
                //});
                Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);





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

                i.SetFlags(ActivityFlags.NewTask);

                context.StartActivity(i);

                //解析msg

                AdjustPushMessage(pushMes);



                //Shared.Application.RunOnMainThread(() =>

                //{

                //    if (Shared.Application.Activity == null)

                //    {

                //        var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);

                //        tempIntent.SetFlags(ActivityFlags.BroughtToFront);

                //        context.StartActivity(tempIntent);



                //        HDLCommon.Current.AdjustPushMessage(pushMes);

                //    }

                //    else

                //    {



                //        (Shared.Application.Activity as BaseActivity).MoveToFront();

                //        HDLCommon.Current.AdjustPushMessage(pushMes);

                //    }

                //});

            }
            catch
            {
@@ -199,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();



        }

    }



}