From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index 6fa3122..c48d449 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -170,7 +170,10 @@
if (!string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId)) {
// 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;
//閲嶇疆鍙傛暟鐘舵��
@@ -201,11 +204,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