From dbc23459fdf4e8b74a5f955fbb9fc631b4babc70 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 17 三月 2021 11:56:16 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC
---
HDL-ON_iOS/ViewController.cs | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index d95816c..72d80b7 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();
@@ -36,16 +48,26 @@
}
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 +97,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