From 44b319fd04ddcd6da211ce0b63fb6844004dad6d Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 26 五月 2022 11:49:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-CQY' into lss
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 6 +++---
DLL/IOS/Shared.IOS.HDLFVSDK.dll | 0
HDL-ON_iOS/AppDelegate.cs | 14 +++++++++-----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
index ded2921..885c7d7 100644
--- a/DLL/IOS/Shared.IOS.HDLFVSDK.dll
+++ b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 2669b27..992f0ff 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";
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 73a83b1..8dc594d 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -108,12 +108,12 @@
<Reference Include="Shared.IOS.HDLSceneSiri">
<HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.HDLFVSDK">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.HDLLinphoneSDK">
<HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS.HDLFVSDK">
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
--
Gitblit v1.8.0