From efd01cddef2e9d29907592cbed154fba548d7ede Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 07 十一月 2023 11:14:43 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_Android/SplashActivity.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 6b6401d..39e931d 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -67,7 +67,6 @@
//OnAppConfig.Instance.FirstRunApp = false;
//OnAppConfig.Instance.SaveConfig();
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
if (localeList.Language == "zh")
@@ -86,6 +85,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -201,7 +204,6 @@
BaseActivity.OnCreateActoin = (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█缂栧彿" + localeList.Language);
if (localeList.Language == "zh")
@@ -220,6 +222,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -250,7 +256,6 @@
BaseActivity.RefreshUIAction = (activity) =>
{
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
if (localeList.Language == "zh")
@@ -269,6 +274,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
--
Gitblit v1.8.0