Merge branch 'CJL' into temp-wxr

wxr

2021-03-26 f676a4c180fc54cc82eecbfcd24d32fe7d8581db

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -57,14 +57,17 @@
            if (jpushExpandData != null && jpushExpandData.messageType != null)
            {
                pushMes.messageType = jpushExpandData.messageType;
                pushMes.expantContent = jpushExpandData.expantContent;
                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
            }

            Utlis.WriteLine("PushMes title : " + pushMes.Title);
            Utlis.WriteLine("PushMes message : " + pushMes.Content);
            Utlis.WriteLine("PushMes extras : " + pushMes.Extras);

            HDLCommon.Current.AdjustPushMessage(pushMes);
            Shared.Application.RunOnMainThread(() =>
            {
                HDLCommon.Current.AdjustPushMessage(pushMes);
            });
        }

        /// <summary>
@@ -157,6 +160,7 @@
                if (jpushExpandData != null && jpushExpandData.messageType != null)
                {
                    pushMes.messageType = jpushExpandData.messageType;
                    pushMes.expantContent = jpushExpandData.expantContent;
                    Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
                }