From 2d414e3b007f750cdad4f9e4a7c04db696bca5e4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 四月 2020 16:13:59 +0800
Subject: [PATCH] 2020-04-23 1.优化远程连接提示，改为Loading方案，防止连接过程用户点击重连图标。 2.点击网络检测图标会判断，是否正在远程连接，如果是，会弹窗提示用户”正在远程连接，是否仍要重新检测“。 3.Help 增加隐藏长按功能，长按后，可以开启远程过程异常弹窗提示。长按后关闭。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
index 3fefd82..f91a70d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
@@ -166,7 +166,7 @@
this.RemoveFromParent ();
needHide = false;
});
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
needHide = false;
}
@@ -219,12 +219,19 @@
UserConfig.Instance.CurrentRegion = UserConfig.Instance.HomeLists [0];
}
}
+ try {
+ if (IsNeedGoToGuideAddGatewayView) {
+ IsNeedGoToGuideAddGatewayView = false;
+ if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
+ //鎻愮ず娌℃湁鍒嗕韩浣忓畢鐨勬潈闄�
+ new Alert ("", ErrorCode.InsufficientAuthority, "Close").Show ();
+ return;
+ }
- if (IsNeedGoToGuideAddGatewayView) {
- IsNeedGoToGuideAddGatewayView = false;
- GotoGuideAddGatewayView (UserConfig.Instance.CurrentRegion);
+ GotoGuideAddGatewayView (UserConfig.Instance.CurrentRegion);
- }
+ }
+ } catch { }
}
@@ -249,6 +256,7 @@
void AccountLogout ()
{
try {
+ this.RemoveFromParent ();
MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
MainPage.LoginUser.SaveUserInfo ();
new AccountLogin ().Show ();
@@ -541,7 +549,7 @@
(Parent as PageLayout).PageIndex = (Parent as PageLayout).ChildrenCount - 1;
} catch {
- System.Console.WriteLine ("============>GotoGuideAddGatewayView 璺宠浆澶辫触 ");
+ Utlis.WriteLine ("============>GotoGuideAddGatewayView 璺宠浆澶辫触 ");
}
}
@@ -571,7 +579,7 @@
System.IO.FileInfo fileInfo = new System.IO.FileInfo (IO.FileUtils.RootPath + fileName);
if (fileInfo.Exists) {
fileInfo.MoveTo (oldRegionRootPath + fileName);
- Console.WriteLine ("move file : " + fileName);
+ Utlis.WriteLine ("move file : " + fileName);
}
index++;
Application.RunOnMainThread (() => {
@@ -605,7 +613,7 @@
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
//this.RemoveFromParent ();
CommonPage.IsRemote = false;
- EquipmentPublicClass.CheckLinkRemote (2);
+ EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
}
if (bNeedCheckAddRoom) {
CheckIfNeedAddRoom ();
@@ -622,7 +630,7 @@
new Alert ("", Language.StringByID (R.MyInternationalizationString.CheckInternet),
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -790,7 +798,7 @@
//鍒涘缓浣忓畢鎴愬姛锛屽垏鎹㈠埌璇ヤ綇瀹�
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>> (revertObj21.ResponseData.ToString ());
if (responseDataObj != null && responseDataObj.Count > 0) {
- ChangeRegion (responseDataObj [0], false, true, goToGuideAddGatewayView);
+ ChangeRegion (responseDataObj [0], true, true, goToGuideAddGatewayView);
}
} else {
--
Gitblit v1.8.0