From 7ed9cc5bb6a07a8358a2705797bd2b31c6e39fd4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 07 一月 2021 18:33:34 +0800
Subject: [PATCH] 2021-01-07 1.注册功能，忘记密码功能相关接口替换，UI界面修改调整。
---
Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index 6fa3122..343363d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -166,18 +166,19 @@
//5.鑳借繙绋�
if (canRemote) {
if (!CommonPage.IsRemote) {
- if (UserConfig.Instance.CheckHomeGateways ()) {
- if (!string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId)) {
+ if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
// 5.1鑳借繙绋�,鏄剧ずCloudUnlink鐘舵�侊紝IsRemote璁句负true寮�濮嬭繙绋�
//MainPage.AddTip ("Please wait, starting remote connection...");
- MainPage.LoadingStart ("Please wait, starting remote connection...");
+ //MainPage.LoadingStart ("Please wait, starting remote connection...");
+
+ MainPage.LoadingTipShow ("Please wait, starting remote connection...");
+
CommonPage.IsRemote = true;
IsRemoteLoadingShow = true;
//閲嶇疆鍙傛暟鐘舵��
SmartHome.MqttCommon.InitState ();
Utlis.ShowAppLinkStatus (AppLinkStatus.CloudUnlink);
- }
}
}
@@ -201,11 +202,15 @@
Utlis.WriteLine ("CheckLinkRemote : " + ex.ToString ());
} finally {
isConnectiong = false;
- if (!IsRemoteLoadingShow) {
- Application.RunOnMainThread (() => {
- MainPage.Loading.Hide ();
- });
- }
+ //if (!IsRemoteLoadingShow) {
+ // Application.RunOnMainThread (() => {
+ // MainPage.Loading.Hide ();
+ // });
+ //}
+
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
}
}) { IsBackground = true }.Start ();
}
--
Gitblit v1.8.0