From f26d7b01a57fdb53dbe58ad355e3c45e3ec06d60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 二月 2021 16:14:02 +0800
Subject: [PATCH] 2021-2-26-1
---
HDL-ON_iOS/ViewController.cs | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index 2f9ac1c..fbf8470 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -15,37 +15,49 @@
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();
- //渚︽祴缃戠粶鍙樺寲
- Reachability.ReachabilityChanged += UpdateStatus;
+ try
+ {
+ //渚︽祴缃戠粶鍙樺寲
+ Reachability.ReachabilityChanged += UpdateStatus;
- UITapGestureRecognizer oTapRecognizer = new UITapGestureRecognizer();
- oTapRecognizer.CancelsTouchesInView = false;
- oTapRecognizer.AddTarget(
- this,
- new ObjCRuntime.Selector("ViewTappedSelector:")
- );
- this.View.AddGestureRecognizer(oTapRecognizer);
+ UITapGestureRecognizer oTapRecognizer = new UITapGestureRecognizer();
+ oTapRecognizer.CancelsTouchesInView = false;
+ oTapRecognizer.AddTarget(
+ this,
+ new ObjCRuntime.Selector("ViewTappedSelector:")
+ );
+ this.View.AddGestureRecognizer(oTapRecognizer);
+ MainPage.InternetStatus = (int)Reachability.InternetConnectionStatus();
+ //HDLCommon.Current.UpdateInternetStatus((int)Reachability.InternetConnectionStatus(), SharedMethod.SharedMethod.IsBackground);
+ }
+ catch
+ {
+
+ }
}
public override UIStatusBarStyle PreferredStatusBarStyle()
{
@@ -73,19 +85,26 @@
void UpdateStatus(object sender, EventArgs e)
{
internetStatus = Reachability.InternetConnectionStatus();
- if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
- {
- Control.Ins.GatewayOnline = false;
- Control.Ins.IsRemote = false;
- }
- else if (internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
- {
- Control.Ins.SearchLoaclGateway();
- }
- else if (internetStatus == NetworkStatus.ReachableViaWiFiNetwork)
- {
- Control.Ins.SearchLoaclGateway();
- }
+ //MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus}");
+ //缃戠粶鍙樺寲澶勭悊
+ HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
+
+ //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