From 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 25 九月 2023 11:08:23 +0800 Subject: [PATCH] Merge branch 'wjc' into Dev-Branch --- HDL-ON_iOS/AppDelegate.cs | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs index 57666c1..86dd531 100644 --- a/HDL-ON_iOS/AppDelegate.cs +++ b/HDL-ON_iOS/AppDelegate.cs @@ -3,10 +3,9 @@ using HDL_ON; using Shared; using UIKit; -using UserNotifications; using HDL_ON.UI; using HDL_ON.DAL.Server; -using Intents; +using System.Threading.Tasks; namespace SharedMethod { @@ -279,6 +278,9 @@ { Language.CurrentLanguage = "Spanish"; } + else if(NSLocale.PreferredLanguages[0].Contains("uk-")){ + Language.CurrentLanguage = "Ukraine"; + } else { Language.CurrentLanguage = "English"; @@ -292,6 +294,22 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions) { + #region 寮傚父鎹曡幏 2023-07-27 17:37:04 + AppDomain.CurrentDomain.UnhandledException += (sender, e) => { + if(e.ExceptionObject is Exception exception) + { + Console.WriteLine("鏈鐞嗙殑寮傚父锛�" + exception.Message); + } + }; + + TaskScheduler.UnobservedTaskException += (sender, e) => { + if (e.Exception is Exception exception) + { + Console.WriteLine("鏈鐞嗙殑寮傚父锛�" + exception.Message); + } + }; + #endregion + //璁剧疆鍏ㄨ閫氱姸鎬� //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion; @@ -328,6 +346,14 @@ //{ // //RemoteInfo.Current.ReadMsgList(true); //} + try + { + UMSdk.HDLUMSDK.InitUMSDKWithAppKey("61d56642e0f9bb492bbc3e72", "IOS"); + } + catch(Exception ex) + { + Console.WriteLine("鍚姩鍙嬬洘SDK寮傚父锛�"+ex.Message); + } Console.WriteLine("FinishedLaunching"); return true; @@ -484,7 +510,7 @@ //杩涘叆鍚庡彴mqtt姝e湪杩炴帴閲嶇疆鐘舵�� HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false; HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop(); - + } -- Gitblit v1.8.0