From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL-ON_iOS/AppDelegate.cs | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 94eb229..9064edf 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -290,7 +290,7 @@
Console.WriteLine("111111111111");
SetCurrentLanguage();
//Shared.Application.FontSize = 12;
- //Bugly.Bugly.StartWithAppId("b58fb35436");
+ Bugly.Bugly.StartWithAppId("b58fb35436");
//鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
//Shared.Application.IsEditTextContentTypePassword = false;
//榛樿浣跨敤鑻规柟瀛椾綋
@@ -327,20 +327,7 @@
return true;
}
- public void AdjustPushMessage(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();
- }
+
/// <summary>
/// 澶勭悊閫氱煡娑堟伅
/// </summary>
@@ -411,7 +398,7 @@
UserInfo.Current.pushMessageInfo = pushMes;
UserInfo.Current.inCall = DateTime.Now;
}
-
+
if (bFinishedLaunching)
{
if (pushMes.Extras != null)
@@ -428,15 +415,15 @@
else
{
//HDLCommon.Current.AdjustPushMessage(pushMes);
- this.AdjustPushMessage(pushMes);
- }
+ this.CommonAdjustPushMessage(pushMes);//2023骞�04鏈�13鏃�15:55:54 淇敼
+ }
}
}
else
{
//HDLCommon.Current.AdjustPushMessage(pushMes);
- this.AdjustPushMessage(pushMes);
- }
+ this.CommonAdjustPushMessage(pushMes);
+ }
}
}
@@ -510,12 +497,33 @@
MainPage.IsEnterBackground = false;
HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
+ //閲嶈繛mqtt闃叉mqtt杩涘叆鍋囨鐘舵�� 2023-05-03 22:55:12 wxr
+ HDL_ON.DAL.Mqtt.MqttClient.InitState();
+
+
new AppUnlockPage().LoadPage();
UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
}
+ 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