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 | 176 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 131 insertions(+), 45 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index 337dd4e..c48d449 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -1,8 +1,5 @@
using System;
using Shared.SimpleControl.Phone;
-using System.Collections.Generic;
-using System.Text;
-using System.Net.NetworkInformation;
namespace Shared.SimpleControl
{
@@ -17,36 +14,54 @@
}
static bool isConnectiong = false;
-
+ static DateTime mFlagDateTime;
/// <summary>
/// 妫�娴�/杩炴帴杩滅▼
/// </summary>
- public static void CheckLinkRemote (int status)
+ /// <param name="status">褰撳墠缃戠粶鐘舵��</param>
+ /// <param name="IsReconnectRemote">鏄惁闇�瑕侀噸鏂拌繛鎺ヨ繙绋�</param>
+ public static void CheckLinkRemote (int status, bool IsReconnectRemote = true)
{
- //if (isConnectiong) {
- // return;
- //}
- //isConnectiong = true;
+
+ //20S鍚庡己鍒堕噸缃甶sConnectiong鐘舵�侊紝闃叉isConnectiong涓�鐩翠负true鐘舵��
+ if (mFlagDateTime.AddSeconds (20).Ticks <= System.DateTime.Now.Ticks) {
+ mFlagDateTime = DateTime.Now;
+ if (isConnectiong) {
+ Utlis.WriteLine ("20s銆媔sConnectiong true ");
+ isConnectiong = false;
+ }
+ }
+
+ if (isConnectiong) {
+ return;
+ }
+ isConnectiong = true;
UserConfig.Instance.internetStatus = status;
#if wallon
- return;
+ return;
#endif
if (MainPage.LoginUser == null || !MainPage.LoginUser.IsLogin) {
+ isConnectiong = false;
return;
}
new System.Threading.Thread (async () => {
+
+ bool IsRemoteLoadingShow = false;
+
try {
if (status == 0) {
Application.RunOnMainThread (() => {
MainPage.AddTip (Language.StringByID (R.MyInternationalizationString.InternetStatusTip));
MainPage.WiFiStatus = "CrabtreeAdd/WiFiUnlink.png";
UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
+
});
+
+ await DisConnectRemoteAsync ();
+
} else {
- if (MainPage.LoginUser == null || !MainPage.LoginUser.IsLogin) {
- return;
- }
+
//Application.RunOnMainThread (() => {
// if (UserMiddle.LinkStatusTip.BackgroundColor == SkinStyle.Current.DelColor) {
// UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.MainColor;
@@ -59,25 +74,50 @@
obj.Split ('_') [1].ToString () == DeviceType.RCU.ToString () ||
obj.Split ('_') [1].ToString () == DeviceType.SuperWireless.ToString () ||
obj.Split ('_') [1].ToString () == DeviceType.OnePortWirelessFR.ToString () ||
- obj.Split ('_') [1].ToString () == DeviceType.OnePortMqttFR.ToString());
+ obj.Split ('_') [1].ToString () == DeviceType.OnePortMqttFR.ToString ());
});
bool canRemote = false;
- if (CommonPage.IsRemote) {
- //await SmartHome.MqttCommon.DisConnectRemoteMqttClient ();
- //await SmartHome.MqttCommon.StartCloudMqtt ();
+
+
+ //1.濡傛灉鏈湴娌＄綉鍏虫暟鎹紝鎻愮ずWiFiOffline锛屽苟涓斿垽鏂槸鍚﹂渶瑕佹柇寮�杩滅▼
+ if (gateWayList == null || gateWayList.Count == 0) {
+ Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+ await DisConnectRemoteAsync ();
+ }
+
+ //2.杩滅▼杩炴帴鎯呭喌涓嬶紝鏄惁闇�瑕佹柇寮�杩炴帴閲嶈繛
+ if (IsReconnectRemote) {
+ if (CommonPage.IsRemote) {
+ CommonPage.IsRemote = false;
+ Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+ await SmartHome.MqttCommon.DisConnectRemoteMqttClient ();
+ }
+ }
+
+ //3.鍙戦�佷竴娆� CheckGateway鏁版嵁
+ if (CommonPage.IsRemote) {
+ //await SmartHome.MqttCommon.StartCloudMqtt ();
SmartHome.MqttCommon.MqttRemoteSend (new byte [] { }, 3);
}
+
+ //4.鏈湴鏄惁瀛樺湪涓庡綋鍓嶄綇瀹呯粦瀹氱綉鍏崇殑鏁版嵁
+ bool HomeGatewaysExistsLocally = false;
foreach (var gatewayFileName in gateWayList) {
var tempStrings = gatewayFileName.Split ('_');
var gateWayString = CommonPage.MyEncodingUTF8.GetString (IO.FileUtils.ReadFile (gatewayFileName));
var common = Newtonsoft.Json.JsonConvert.DeserializeObject<GatewayBase> (gateWayString);
if (common != null) {
if (common.MAC.Replace (".", "") == UserConfig.Instance.GatewayMAC.Replace (".", "")) {
+ //4.1 鏈湴瀛樺湪涓庡綋鍓嶄綇瀹呯粦瀹氱綉鍏崇殑鏁版嵁锛屽鏋滄槸WiFi杩炴帴锛屽氨灞�鍩熺綉鎼滅储缃戝叧鏄惁鍦ㄥ悓涓�灞�鍩熺綉
+ HomeGatewaysExistsLocally = true;
canRemote = true;
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),
@@ -85,43 +125,34 @@
SubnetID = common.SubnetID,
DeviceID = common.DeviceID,
AddData = new byte [] { (byte)new Random ().Next (255), (byte)new Random ().Next (255) },
- }, SendCount.Three, true,true);
- var result = control.UsefulBytes;
+ }, SendCount.Three, true, true);
+ var result = control.UsefulBytes;
#endregion
if (result != null) {
canRemote = false;
var mac0 = CommonPage.byteToHex16 (result [5]) + "." + CommonPage.byteToHex16 (result [6]) + "." + CommonPage.byteToHex16 (result [7]) + "." + CommonPage.byteToHex16 (result [8]) + "." + CommonPage.byteToHex16 (result [9]) + "." + CommonPage.byteToHex16 (result [10]) + "." + CommonPage.byteToHex16 (result [11]) + "." + CommonPage.byteToHex16 (result [12]);
if (common.MAC == mac0) {
- //var gatewayBytes = Control.ControlBytesSendHasReturn (Command.ReadGateWayModelInfo, common.SubnetID, common.DeviceID, new byte [] { });
- #region
- control.Send (new Target () {
- IPEndPoint = new System.Net.IPEndPoint (System.Net.IPAddress.Parse (new Net.NetWiFi ().BroadcastIpAddress.ToString ()), 6000),
- Command = Command.ReadGateWayModelInfo,
- SubnetID = common.SubnetID,
- DeviceID = common.DeviceID,
- AddData = new byte [] { },
- }, SendCount.Three, true,true);
- var gatewayBytes = control.UsefulBytes;
- #endregion
- if (gatewayBytes != null) {
- //common.Remote_GroupName = CommonPage.MyEncodingGB2312.GetString (gatewayBytes, 1, 20).Trim ('\0');
- //common.Remote_ProjectName = CommonPage.MyEncodingGB2312.GetString (gatewayBytes, 21, 20).Trim ('\0');
- //common.Remote_UserName = CommonPage.MyEncodingGB2312.GetString (gatewayBytes, 41, 8).Trim ('\0');
- //common.Remote_Password = CommonPage.MyEncodingGB2312.GetString (gatewayBytes, 49, 8).Trim ('\0');
- //var requestJson2 = @"{'Token':'" + MainPage.LoginUser.LoginTokenString + "','MAC':'" + common.MAC + "','Password':'" + common.Remote_Password + "'}";
- //var revertObj2 = MainPage.RequestHttps ("UpdateRemoteSwitchPassword", requestJson2, true, false);
- return;
- }
+ //4.2 缃戝叧鍦ㄥ悓涓�灞�鍩熺綉锛屾樉绀篧iFi鐘舵�侊紝鍙栨秷杩滅▼鏂紑杩滅▼杩炴帴
+ CommonPage.IsRemote = false;
Application.RunOnMainThread (() => {
MainPage.WiFiStatus = "CrabtreeAdd/WiFi.png";
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;
@@ -129,27 +160,82 @@
}
}
}
- if (canRemote && !CommonPage.IsRemote) {
- if (UserConfig.Instance.CheckHomeGateways ()) {
- if (!string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways[0].GatewayUniqueId)) {
- Shared.SimpleControl.CommonPage.IsRemote = true;
- await SmartHome.MqttCommon.StartCloudMqtt ();
+
+
+
+ //5.鑳借繙绋�
+ if (canRemote) {
+ if (!CommonPage.IsRemote) {
+ if (UserConfig.Instance.CheckHomeGateways ()) {
+ 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.LoadingTipShow ("Please wait, starting remote connection...");
+
+ CommonPage.IsRemote = true;
+ IsRemoteLoadingShow = true;
+ //閲嶇疆鍙傛暟鐘舵��
+ SmartHome.MqttCommon.InitState ();
+ Utlis.ShowAppLinkStatus (AppLinkStatus.CloudUnlink);
+
+ }
}
}
+
+ } else {
+
+ //6.涓嶈兘杩滅▼锛屽鏋滀箣鍓嶈繙绋嬫ā寮忓垯鏂紑MQTT杩炴帴,鏄剧ず涓烘湭杩炴帴
+ if (CommonPage.IsRemote) {
+ Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+ CommonPage.IsRemote = false;
+ await SmartHome.MqttCommon.DisConnectRemoteMqttClient ();
+
+ }
+ //鏈湴涓嶅瓨鍦ㄤ笌褰撳墠浣忓畢缁戝畾缃戝叧鐨勬暟鎹�
+ if (!HomeGatewaysExistsLocally) {
+ Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+ }
+
}
}
} catch (Exception ex) {
- Console.WriteLine ("CheckLinkRemote : " + ex.ToString ());
+ Utlis.WriteLine ("CheckLinkRemote : " + ex.ToString ());
} finally {
isConnectiong = false;
+ //if (!IsRemoteLoadingShow) {
+ // Application.RunOnMainThread (() => {
+ // MainPage.Loading.Hide ();
+ // });
+ //}
+
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
});
}
}) { IsBackground = true }.Start ();
}
+
+ //static bool IsRemoteLoadingShow = false;
+
+ /// <summary>
+ /// 鍏抽棴杩滅▼杩炴帴妯″紡锛屽苟鏂紑MQTT
+ /// </summary>
+ /// <returns></returns>
+ static async System.Threading.Tasks.Task DisConnectRemoteAsync ()
+ {
+
+ if (CommonPage.IsRemote) {
+ CommonPage.IsRemote = false;
+ await SmartHome.MqttCommon.DisConnectRemoteMqttClient ();
+ }
+ }
}
}
+
+
+
--
Gitblit v1.8.0