From 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL-ON_iOS/AppDelegate.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index af7af24..22ddcd3 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -262,7 +262,7 @@
{
Language.CurrentLanguage = "russian";
}
- else if (NSLocale.PreferredLanguages[0].Contains( "bul"))
+ else if (NSLocale.PreferredLanguages[0].Contains("bul"))
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
@@ -327,10 +327,11 @@
return true;
}
- /// <summary>
- /// 澶勭悊閫氱煡娑堟伅
- /// </summary>
- void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
+
+ /// <summary>
+ /// 澶勭悊閫氱煡娑堟伅
+ /// </summary>
+ void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
{
try
{
@@ -397,7 +398,7 @@
UserInfo.Current.pushMessageInfo = pushMes;
UserInfo.Current.inCall = DateTime.Now;
}
-
+
if (bFinishedLaunching)
{
if (pushMes.Extras != null)
@@ -413,13 +414,15 @@
}
else
{
- HDLCommon.Current.AdjustPushMessage(pushMes);
+ //HDLCommon.Current.AdjustPushMessage(pushMes);
+ this.CommonAdjustPushMessage(pushMes);//2023骞�04鏈�13鏃�15:55:54 淇敼
}
}
}
else
{
- HDLCommon.Current.AdjustPushMessage(pushMes);
+ //HDLCommon.Current.AdjustPushMessage(pushMes);
+ this.CommonAdjustPushMessage(pushMes);
}
}
@@ -500,6 +503,23 @@
}
+ public void CommonAdjustPushMessage(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();
+
+ }
+
+
}
}
--
Gitblit v1.8.0