From 925e55bc815de89575ec53880d3e059596fda6e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 13:23:46 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL-ON_iOS/ViewController.cs | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index cc678f3..d95816c 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -15,7 +15,7 @@
base.ViewDidLoad();
- if (string.IsNullOrEmpty(UserInfo.Current.SetLanguage))
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.SetLanguage))
{
if (NSLocale.PreferredLanguages[0].Contains("zh-"))
{
@@ -32,7 +32,7 @@
}
else
{
- Language.CurrentLanguage = UserInfo.Current.SetLanguage;
+ Language.CurrentLanguage = OnAppConfig.Instance.SetLanguage;
}
HDL_ON.MainPage.Show();
@@ -73,22 +73,26 @@
void UpdateStatus(object sender, EventArgs e)
{
internetStatus = Reachability.InternetConnectionStatus();
- if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
- {
- Control.Ins.GatewayOnline = false;
- Control.Ins.IsRemote = false;
- MainPage.InternetStatus = 0;
- }
- else if (internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
- {
- Control.Ins.SearchLoaclGateway();
- MainPage.InternetStatus = 1;
- }
- else if (internetStatus == NetworkStatus.ReachableViaWiFiNetwork)
- {
- Control.Ins.SearchLoaclGateway();
- MainPage.InternetStatus = 2;
- }
+ //MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus}");
+ //缃戠粶鍙樺寲澶勭悊
+ HDLCommon.Current.UpdateInternetStatus((int)internetStatus, SharedMethod.SharedMethod.IsBackground);
+
+ //if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
+ //{
+ // Control.Ins.GatewayOnline = false;
+ // Control.Ins.IsRemote = false;
+ // MainPage.InternetStatus = 0;
+ //}
+ //else if (internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
+ //{
+ // Control.Ins.SearchLoaclGateway();
+ // MainPage.InternetStatus = 1;
+ //}
+ //else if (internetStatus == NetworkStatus.ReachableViaWiFiNetwork)
+ //{
+ // Control.Ins.SearchLoaclGateway();
+ // MainPage.InternetStatus = 2;
+ //}
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0