From 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 三月 2020 14:31:53 +0800
Subject: [PATCH] 2020-03-10 1.替换最新控件库，增加无网络监听，Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线，发送CheckGateway间隔为10S，收到主题刷新该时间，重置发送次数，发送次数到达3次以上，则判定网关为离线状态。 4.远程重复增加为3次，重发后等待5s才回调结果。 5.修复去掉普通继电器读电能操作。 6.读状态间隔缩短为200ms。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
index 3fefd82..2b49a86 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
@@ -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 ();
@@ -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 ();
@@ -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