From 0a8ec482a5ad10bf3cd7010c89630b42ecaca741 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:19:31 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL-ON_iOS/ViewController.cs | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index d95816c..c4016d2 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -10,6 +10,18 @@
{
public partial class ViewController : ViewControllerBase
{
+
+ public override void ViewWillAppear(bool animated)
+ {
+ base.ViewWillAppear(animated);
+ //2021-02-01 璁剧疆NavigationBarHidden true
+ if (this.NavigationController != null)
+ {
+ this.NavigationController.NavigationBar.Hidden = true;
+ this.NavigationController.NavigationBar.TintColor = UIColor.Black;
+ }
+ }
+
public override void ViewDidLoad()
{
base.ViewDidLoad();
@@ -34,18 +46,31 @@
{
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()
{
@@ -75,7 +100,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