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 | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index 5946475..343363d 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) {
@@ -111,6 +115,9 @@
if (status == 2) {
//var result = Control.ControlBytesSendHasReturn (Command.ReadGateway, common.SubnetID, common.DeviceID, new byte [] { (byte)new Random ().Next (255), (byte)new Random ().Next (255) });
#region
+ //寮�濮嬫湰鍦版悳绱㈢綉鍏�...
+ MainPage.LoadingStart ("Searching local gateway...");
+
var control = new Control ();
control.Send (new Target () {
IPEndPoint = new System.Net.IPEndPoint (System.Net.IPAddress.Parse (new Net.NetWiFi ().BroadcastIpAddress.ToString ()), 6000),
@@ -133,10 +140,19 @@
UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
MainPage.Loading.Hide ();
});
+ //鎼滅储鎴愬姛锛屽惎鐢ㄦ湰鍦拌繛鎺�
+ MainPage.AddTip ("Gateway searched successfully, enable local connection.");
+
Shared.SimpleControl.Phone.UserMiddle.ReadAllDeviceStatus ();
await SmartHome.MqttCommon.DisConnectRemoteMqttClient ();
return;
+ } else {
+
}
+ } else {
+ //鎼滅储澶辫触锛屽惎鐢ㄨ繙绋嬭繛鎺�
+ MainPage.AddTip ("Gateway cannot be searched locally.");
+
}
} else {
break;
@@ -150,16 +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 ("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);
+
}
}
@@ -183,6 +202,12 @@
Utlis.WriteLine ("CheckLinkRemote : " + ex.ToString ());
} finally {
isConnectiong = false;
+ //if (!IsRemoteLoadingShow) {
+ // Application.RunOnMainThread (() => {
+ // MainPage.Loading.Hide ();
+ // });
+ //}
+
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
});
@@ -190,7 +215,7 @@
}) { IsBackground = true }.Start ();
}
-
+ //static bool IsRemoteLoadingShow = false;
/// <summary>
/// 鍏抽棴杩滅▼杩炴帴妯″紡锛屽苟鏂紑MQTT
--
Gitblit v1.8.0