From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Home.Ios/MainViewController.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/MainViewController.cs b/ZigbeeApp/Home.Ios/MainViewController.cs
old mode 100644
new mode 100755
index 151b277..902e55c
--- a/ZigbeeApp/Home.Ios/MainViewController.cs
+++ b/ZigbeeApp/Home.Ios/MainViewController.cs
@@ -12,6 +12,12 @@
{
base.ViewDidLoad();
+ //11.0鐗堟湰浠ヤ笅鑷姩鍋忕Щ鍙栨秷
+ if (!UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+ {
+ this.AutomaticallyAdjustsScrollViewInsets = false;
+ }
+
if (NSLocale.PreferredLanguages[0].Contains("zh-"))
{
//if (NSLocale.PreferredLanguages [0].Contains (@"zh-") && NSLocale.PreferredLanguages [0].Contains (@"-CN")) {
@@ -77,15 +83,15 @@
internetStatus = Reachability.InternetConnectionStatus();
if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
{
- Shared.Common.CommonPage.nowNetworkMode = 0;
+ //Shared.Common.CommonPage.nowNetworkMode = 0;
}
else if (internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
{
- Shared.Common.CommonPage.nowNetworkMode = 1;
+ //Shared.Common.CommonPage.nowNetworkMode = 1;
}
else if (internetStatus == NetworkStatus.ReachableViaWiFiNetwork)
{ //wifi鐨勭綉缁滆繛鎺� 2
- Shared.Common.CommonPage.nowNetworkMode = 2;
+ //Shared.Common.CommonPage.nowNetworkMode = 2;
}
}
}
--
Gitblit v1.8.0