Merge branch 'CJL' into NewFilePath

wxr

2020-12-18 5ea6aa8ea047d4d7b6137fa86c03109aeb1b67ff

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -50,12 +50,43 @@
                Content = notificationMessage.NotificationContent,
                Extras = notificationMessage.NotificationExtras
            };

            var jpushExpandData = GetJPushExpandData(pushMes);
            if (jpushExpandData != null && jpushExpandData.messageType != null)
            {
                pushMes.messageType = jpushExpandData.messageType;
                System.Console.WriteLine("PushMes messageType : " + pushMes.messageType);
            }

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

            HDLCommon.Current.AdjustPushMessage(pushMes);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="pushMes"></param>
        /// <returns></returns>
        ExpandData GetJPushExpandData(JPushMessageInfo pushMes)
        {
            try
            {
                if (pushMes.Extras != null)
                {
                    var jpushExpandData = Newtonsoft.Json.JsonConvert.DeserializeObject<JPushExpandData>(pushMes.Extras.ToString());
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<ExpandData>(jpushExpandData.expandData);
                }
                return null;
            }
            catch
            {
                return null;
            }
        }


        /// <summary>
        /// 注册成功回调
@@ -122,6 +153,14 @@
                    Content = notificationMessage.NotificationContent,
                    Extras = notificationMessage.NotificationExtras
                };

                var jpushExpandData = GetJPushExpandData(pushMes);
                if (jpushExpandData != null && jpushExpandData.messageType != null)
                {
                    pushMes.messageType = jpushExpandData.messageType;
                    System.Console.WriteLine("PushMes messageType : " + pushMes.messageType);
                }

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