Merge branch 'CJL' into NewFilePath

wxr

2020-12-18 5ea6aa8ea047d4d7b6137fa86c03109aeb1b67ff

 HDL-ON_iOS/AppDelegate.cs

@@ -295,6 +295,7 @@
                    var body = alert["body"] as NSString;
                    var title = alert["title"] as NSString;
                    var expandData = "";
                    var messageType = "";
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataStr = userInfo["expandData"] as NSString;
@@ -304,6 +305,11 @@
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
                                    messageType = expandDataNSD["messageType"] as NSString;
                                    Utlis.WriteLine("messageType: "+ messageType);
                                }
                                
                            }
                        }
                        else
@@ -311,20 +317,13 @@
                            expandData = expandDataStr;
                        }

                        //var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        //if (expandDataNSD != null && expandDataNSD is NSDictionary)
                        //{
                        //    if (expandDataNSD.ContainsKey(new NSString("messageType")))
                        //    {
                        //        expandData = expandDataNSD["messageType"] as NSString;
                        //    }
                        //}
                    }
                    var pushMes = new JPushMessageInfo()
                    {
                        Title = title,
                        Content = body,
                        Extras = expandData,
                        messageType = messageType
                    };
                    System.Console.WriteLine("PushMes title : " + pushMes.Title);
                    System.Console.WriteLine("PushMes message : " + pushMes.Content);