From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/ON.Ios/ViewController.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Crabtree/ON.Ios/ViewController.cs b/Crabtree/ON.Ios/ViewController.cs
old mode 100755
new mode 100644
index 4f76b45..e49908a
--- a/Crabtree/ON.Ios/ViewController.cs
+++ b/Crabtree/ON.Ios/ViewController.cs
@@ -22,12 +22,13 @@
} else {
Shared.Application.FontSize = 16;
}
- if (NSLocale.PreferredLanguages [0].Contains ("zh-")) {
- Language.CurrentLanguage = "Chinese";
- } else {
- Language.CurrentLanguage = "English";
- }
-
+ //if (NSLocale.PreferredLanguages [0].Contains ("zh-")) {
+ // Language.CurrentLanguage = "Chinese";
+ //} else {
+ // Language.CurrentLanguage = "English";
+ //}
+ //鍗板害APP榛樿浣跨敤鑻辨枃
+ Language.CurrentLanguage = "English";
MainPage.Show ();
internetStatus = Reachability.InternetConnectionStatus ();
@@ -35,6 +36,8 @@
//渚︽祴缃戠粶鍙樺寲
Reachability.ReachabilityChanged += UpdateStatus;
+
+ Shared.SimpleControl.EquipmentPublicClass.CheckLinkRemote ((int)internetStatus, false);
UITapGestureRecognizer oTapRecognizer = new UITapGestureRecognizer ();
oTapRecognizer.CancelsTouchesInView = false;
@@ -70,7 +73,8 @@
{
internetStatus = Reachability.InternetConnectionStatus ();
UserConfig.Instance.internetStatus = (int)internetStatus;
- Shared.SimpleControl.EquipmentPublicClass.CheckLinkRemote ((int)internetStatus);
+ //缃戠粶鍙樺寲閫氱煡
+ Shared.SimpleControl.EquipmentPublicClass.CheckLinkRemote ((int)internetStatus, false);
if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
{
} else if (internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
--
Gitblit v1.8.0