From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index df7ec49..c48d449 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -46,6 +46,9 @@
}
new System.Threading.Thread (async () => {
+
+ bool IsRemoteLoadingShow = false;
+
try {
if (status == 0) {
Application.RunOnMainThread (() => {
@@ -75,6 +78,7 @@
});
bool canRemote = false;
+
//1.濡傛灉鏈湴娌＄綉鍏虫暟鎹紝鎻愮ずWiFiOffline锛屽苟涓斿垽鏂槸鍚﹂渶瑕佹柇寮�杩滅▼
if (gateWayList == null || gateWayList.Count == 0) {
@@ -112,7 +116,7 @@
//var result = Control.ControlBytesSendHasReturn (Command.ReadGateway, common.SubnetID, common.DeviceID, new byte [] { (byte)new Random ().Next (255), (byte)new Random ().Next (255) });
#region
//寮�濮嬫湰鍦版悳绱㈢綉鍏�...
- MainPage.AddTip ("Searching local gateway...");
+ MainPage.LoadingStart ("Searching local gateway...");
var control = new Control ();
control.Send (new Target () {
@@ -147,7 +151,7 @@
}
} else {
//鎼滅储澶辫触锛屽惎鐢ㄨ繙绋嬭繛鎺�
- MainPage.AddTip ("Gateway not found, enable remote connection.");
+ MainPage.AddTip ("Gateway cannot be searched locally.");
}
} else {
@@ -165,12 +169,17 @@
if (UserConfig.Instance.CheckHomeGateways ()) {
if (!string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId)) {
// 5.1鑳借繙绋�,鏄剧ずCloudUnlink鐘舵�侊紝IsRemote璁句负true寮�濮嬭繙绋�
- MainPage.AddTip ("Starting remote connection mode...");
+ //MainPage.AddTip ("Please wait, starting remote connection...");
+ //MainPage.LoadingStart ("Please wait, starting remote connection...");
- Utlis.ShowAppLinkStatus (AppLinkStatus.CloudUnlink);
+ MainPage.LoadingTipShow ("Please wait, starting remote connection...");
+
CommonPage.IsRemote = true;
- SmartHome.MqttCommon.IsGatewayOnline = false;
- //await SmartHome.MqttCommon.StartCloudMqtt ();
+ IsRemoteLoadingShow = true;
+ //閲嶇疆鍙傛暟鐘舵��
+ SmartHome.MqttCommon.InitState ();
+ Utlis.ShowAppLinkStatus (AppLinkStatus.CloudUnlink);
+
}
}
}
@@ -195,6 +204,12 @@
Utlis.WriteLine ("CheckLinkRemote : " + ex.ToString ());
} finally {
isConnectiong = false;
+ //if (!IsRemoteLoadingShow) {
+ // Application.RunOnMainThread (() => {
+ // MainPage.Loading.Hide ();
+ // });
+ //}
+
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
});
@@ -202,7 +217,7 @@
}) { IsBackground = true }.Start ();
}
-
+ //static bool IsRemoteLoadingShow = false;
/// <summary>
/// 鍏抽棴杩滅▼杩炴帴妯″紡锛屽苟鏂紑MQTT
--
Gitblit v1.8.0