From bee4133c05f9c41f24ec7fa7449faabb79306087 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 21 一月 2021 15:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL-ON_iOS/ViewController.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index 22e1aa9..fbf8470 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -15,25 +15,28 @@
base.ViewDidLoad();
- if (string.IsNullOrEmpty(OnAppConfig.Instance.SetLanguage))
- {
- if (NSLocale.PreferredLanguages[0].Contains("zh-"))
- {
- Language.CurrentLanguage = "Chinese";
- }
- else if (NSLocale.PreferredLanguages[0].Contains("cs-"))
- {
- Language.CurrentLanguage = "Czech";
- }
- else
- {
- Language.CurrentLanguage = "English";
- }
- }
- else
- {
- Language.CurrentLanguage = OnAppConfig.Instance.SetLanguage;
- }
+ //if (string.IsNullOrEmpty(OnAppConfig.Instance.SetLanguage))
+ //{
+ // if (NSLocale.PreferredLanguages[0].Contains("zh-"))
+ // {
+ // Language.CurrentLanguage = "Chinese";
+ // }
+ // else if (NSLocale.PreferredLanguages[0].Contains("cs-"))
+ // {
+ // Language.CurrentLanguage = "Czech";
+ // }
+ // else
+ // {
+ // Language.CurrentLanguage = "English";
+ // }
+ //}
+ //else
+ //{
+ // Language.CurrentLanguage = OnAppConfig.Instance.SetLanguage;
+ //}
+#if DEBUG
+ Language.CurrentLanguage = "English";
+#endif
HDL_ON.MainPage.Show();
try
@@ -84,7 +87,7 @@
internetStatus = Reachability.InternetConnectionStatus();
//MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus}");
//缃戠粶鍙樺寲澶勭悊
- HDLCommon.Current.UpdateInternetStatus((int)internetStatus, SharedMethod.SharedMethod.IsBackground);
+ HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
//if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
//{
--
Gitblit v1.8.0