From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_iOS/AppDelegate.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 2669b27..702722c 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -92,7 +92,7 @@
// Get previous device token
var oldDeviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
- new Alert("", DeviceToken, "鍙栨秷", "纭畾").Show();
+ //new Alert("", DeviceToken, "鍙栨秷", "纭畾").Show();
//NSDictionary test = new NSDictionary(new NSString("123"), new NSString("test"));
//NSError error;
@@ -135,10 +135,10 @@
Console.WriteLine("鎺ㄩ�佹秷鎭細"+userInfo);
//var test = new NSDictionary();
//test.SetNilValueForKey(new NSString("test"));
- NSError error;
- NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
- NSString str = new NSString(dicD, NSStringEncoding.UTF8);
- new Alert("", str, "鍙栨秷", "纭畾").Show();
+ //NSError error;
+ //NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
+ //NSString str = new NSString(dicD, NSStringEncoding.UTF8);
+ //new Alert("", str, "鍙栨秷", "纭畾").Show();
//璇诲彇鎺ㄩ�佷俊鎭�
UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
@@ -262,6 +262,10 @@
//{
// Language.CurrentLanguage = "russian";
//}
+ else if (NSLocale.PreferredLanguages[0].Contains("es-"))
+ {
+ Language.CurrentLanguage = "Spanish";
+ }
else
{
Language.CurrentLanguage = "English";
@@ -384,6 +388,11 @@
Utlis.WriteLine("PushMes title : " + pushMes.Title);
Utlis.WriteLine("PushMes message : " + pushMes.Content);
Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
+ if (!string.IsNullOrEmpty(pushMes.spk))//鑷爺鍙瀵硅闇�瑕佽褰曟椂闂村弽鍛�
+ {
+ UserInfo.Current.pushMessageInfo = pushMes;
+ UserInfo.Current.inCall = DateTime.Now;
+ }
if (bFinishedLaunching)
{
--
Gitblit v1.8.0