From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL-ON_iOS/AppDelegate.cs | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 94eb229..e2c07be 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -4,9 +4,6 @@
using Shared;
using UIKit;
using UserNotifications;
-using Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
using HDL_ON.UI;
using HDL_ON.DAL.Server;
using Intents;
@@ -189,8 +186,12 @@
public override void OnResignActivation(UIApplication application)
{
//璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
-
+ string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+ string errorVersion = "16.2.0";
+ if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+ {
+ Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
+ }
Console.WriteLine("OnResignActivation");
UserInfo.Current.unlockTime = DateTime.Now;
}
@@ -198,8 +199,12 @@
public override void DidEnterBackground(UIApplication application)
{
//璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
-
+ //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+ //string errorVersion = "16.2.0";
+ //if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+ //{
+ // Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
+ //}
//SharedMethod.SharedMethod.IsBackground = true;
//MainPage.IsEnterBackground = true;
////杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
@@ -226,8 +231,12 @@
public override void OnActivated(UIApplication application)
{
//璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
-
+ //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+ //string errorVersion = "16.2.0";
+ //if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+ //{
+ // Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
+ //}
Console.WriteLine("OnActivated");
base.OnActivated(application);
//HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -285,12 +294,16 @@
{
//璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
-
+ //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+ //string errorVersion = "16.2.0";
+ //if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+ //{
+ // Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
+ //}
Console.WriteLine("111111111111");
SetCurrentLanguage();
//Shared.Application.FontSize = 12;
- //Bugly.Bugly.StartWithAppId("b58fb35436");
+ Bugly.Bugly.StartWithAppId("1dc40c170a");
//鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
//Shared.Application.IsEditTextContentTypePassword = false;
//榛樿浣跨敤鑻规柟瀛椾綋
@@ -304,8 +317,6 @@
Window.RootViewController = rootViewController;
Window.MakeKeyAndVisible();
- AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e", typeof(Analytics), typeof(Crashes));
-
SharedMethod.SharedMethod.sharedApp = application;
//NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
application.StatusBarStyle = UIStatusBarStyle.DarkContent;
@@ -318,33 +329,15 @@
// //RemoteInfo.Current.ReadMsgList(true);
//}
- //楂樺痉key
- GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
-
- //楂樺痉key
- GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
Console.WriteLine("FinishedLaunching");
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>
- void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
+
+ /// <summary>
+ /// 澶勭悊閫氱煡娑堟伅
+ /// </summary>
+ void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
{
try
{
@@ -362,13 +355,14 @@
if (userInfo.ContainsKey(new NSString("expandData")))
{
var expandDataStr = userInfo["expandData"] as NSString;
- if(expandDataStr == null)
+ if (expandDataStr == null)
{
var expandDataNSD = userInfo["expandData"] as NSDictionary;
if (expandDataNSD != null)
{
expandData = expandDataNSD.ToString();
- if(expandDataNSD.ContainsKey(new NSString("messageType"))){
+ if (expandDataNSD.ContainsKey(new NSString("messageType")))
+ {
messageType = expandDataNSD["messageType"] as NSString;
Utlis.WriteLine("messageType: " + messageType);
}
@@ -428,16 +422,16 @@
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);
+ }
+
}
}
catch
@@ -510,12 +504,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