From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:30 +0800
Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC

---
 HDL-ON_iOS/AppDelegate.cs |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 58437b4..e2fb0ec 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -245,6 +245,7 @@
 
         public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
         {
+            Console.WriteLine("111111111111");
             SetCurrentLanguage();
             //Shared.Application.FontSize = 12;
             //Bugly.Bugly.StartWithAppId("b58fb35436");
@@ -274,8 +275,8 @@
             //{
             //    //RemoteInfo.Current.ReadMsgList(true);
             //}
-            //涓枃鍥藉唴key銆佽嫳鏂囨捣澶杒ey
-            EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+            //楂樺痉key
+            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
             Console.WriteLine("FinishedLaunching");
             return true;
         }
@@ -295,6 +296,8 @@
                     var title = alert["title"] as NSString;
                     var expandData = "";
                     var messageType = "";
+                    var expantContent = "";
+                    var homeId = "";
                     if (userInfo.ContainsKey(new NSString("expandData")))
                     {
                         var expandDataStr = userInfo["expandData"] as NSString;
@@ -308,7 +311,19 @@
                                     messageType = expandDataNSD["messageType"] as NSString;
                                     Utlis.WriteLine("messageType: " + messageType);
                                 }
-                                
+
+                                if (expandDataNSD.ContainsKey(new NSString("expantContent")))
+                                {
+                                    expantContent = expandDataNSD["expantContent"] as NSString;
+                                    Utlis.WriteLine("expantContent: " + expantContent);
+                                }
+
+                                if (expandDataNSD.ContainsKey(new NSString("homeId")))
+                                {
+                                    homeId = expandDataNSD["homeId"].ToString();
+                                    Utlis.WriteLine("homeId: " + homeId);
+                                }
+
                             }
                         }
                         else
@@ -319,10 +334,12 @@
                     }
                     var pushMes = new JPushMessageInfo()
                     {
+                        HomeId = homeId,
                         Title = title,
                         Content = body,
                         Extras = expandData,
-                        messageType = messageType
+                        messageType = messageType,
+                        expantContent = expantContent
                     };
                     Utlis.WriteLine("PushMes title : " + pushMes.Title);
                     Utlis.WriteLine("PushMes message : " + pushMes.Content);

--
Gitblit v1.8.0