From bbd6b592a6b883e013ff1e0a574976ceba5009ea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 27 十月 2022 09:11:33 +0800
Subject: [PATCH] Merge branch 'dev--wxr'
---
HDL-ON_Android/SplashActivity.cs | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index bed7401..07a8b17 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -41,7 +41,7 @@
base.OnActivityResult(requestCode, resultVal, data);
}
-
+ [Obsolete]
protected override void OnCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);
@@ -57,7 +57,30 @@
if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
{
-
+ Language.CurrentLanguage = "Chinese";
+ Locale locale1 = Locale.Default;
+ var localeList = Resources.Configuration.Locale;
+ if (localeList.Language == "zh")
+ {
+ Language.CurrentLanguage = "Chinese";
+ }
+ else if (localeList.Language == "es")
+ {
+ Language.CurrentLanguage = "Spanish";
+ }
+ else if (localeList.Language == "ru")
+ {
+ Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
+ }
+
Intent intent = new Intent(this, typeof(AgreementActivity));
StartActivityForResult(intent,99);
}
@@ -143,7 +166,7 @@
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
- Console.WriteLine("999999999999999999999999999999999999999999999"+ localeList.Language);
+ Console.WriteLine("褰撳墠璇█缂栧彿"+ localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
@@ -155,6 +178,10 @@
else if (localeList.Language == "ru")
{
Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
else
{
@@ -188,7 +215,7 @@
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
- Console.WriteLine("999999999999999999999999999999999999999999999" + localeList.Language);
+ Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
@@ -200,6 +227,10 @@
else if (localeList.Language == "ru")
{
Language.CurrentLanguage = "russian";
+ }
+ else if (localeList.Language == "bg")
+ {
+ Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
else
{
@@ -229,6 +260,7 @@
{
try
{
+
if (isfirst)
{
//鍙Е鍙戜竴娆�
@@ -237,7 +269,7 @@
}
isfirst = false;
///鐩戝惉缁忕含搴�
- HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent(lon, lat);
+ HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat);
//鍏抽棴瀹氫綅鏈嶅姟
//Shared.Application.StopGPSLocationService();
}
--
Gitblit v1.8.0