From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL-ON_iOS/ViewController.cs | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index 22e1aa9..ddecb00 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -10,30 +10,23 @@
{
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()
{
+ Console.WriteLine("qidong 1111");
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;
- }
HDL_ON.MainPage.Show();
try
@@ -55,6 +48,7 @@
{
}
+
}
public override UIStatusBarStyle PreferredStatusBarStyle()
{
@@ -84,7 +78,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