From bbc74a6dae2e90a811b2507c5896fe89aa29ccc0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 08 一月 2020 11:30:46 +0800
Subject: [PATCH] 2020-01-08 1.替换新服务器接口。
---
Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
index b66d7a9..337dd4e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -23,10 +23,10 @@
/// </summary>
public static void CheckLinkRemote (int status)
{
- if (isConnectiong) {
- return;
- }
- isConnectiong = true;
+ //if (isConnectiong) {
+ // return;
+ //}
+ //isConnectiong = true;
UserConfig.Instance.internetStatus = status;
#if wallon
return;
@@ -40,24 +40,26 @@
if (status == 0) {
Application.RunOnMainThread (() => {
MainPage.AddTip (Language.StringByID (R.MyInternationalizationString.InternetStatusTip));
- UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
+ MainPage.WiFiStatus = "CrabtreeAdd/WiFiUnlink.png";
+ UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
});
} else {
if (MainPage.LoginUser == null || !MainPage.LoginUser.IsLogin) {
return;
}
- Application.RunOnMainThread (() => {
- if (UserMiddle.LinkStatusTip.BackgroundColor == SkinStyle.Current.DelColor) {
- UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.MainColor;
- }
- });
+ //Application.RunOnMainThread (() => {
+ // if (UserMiddle.LinkStatusTip.BackgroundColor == SkinStyle.Current.DelColor) {
+ // UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.MainColor;
+ // }
+ //});
var localFileList = IO.FileUtils.ReadFiles ();
var gateWayList = localFileList.FindAll ((obj) => {
return (obj.StartsWith ("Equipment_")) && (
obj.Split ('_') [1].ToString () == DeviceType.OnePortBus.ToString () ||
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.OnePortWirelessFR.ToString () ||
+ obj.Split ('_') [1].ToString () == DeviceType.OnePortMqttFR.ToString());
});
bool canRemote = false;
if (CommonPage.IsRemote) {
@@ -103,16 +105,17 @@
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);
+ //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;
}
Application.RunOnMainThread (() => {
- UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.LinkStatusTipColor;
+ MainPage.WiFiStatus = "CrabtreeAdd/WiFi.png";
+ UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
MainPage.Loading.Hide ();
});
Shared.SimpleControl.Phone.UserMiddle.ReadAllDeviceStatus ();
@@ -127,9 +130,11 @@
}
}
if (canRemote && !CommonPage.IsRemote) {
- if (!string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.MAC)) {
- Shared.SimpleControl.CommonPage.IsRemote = true;
- await SmartHome.MqttCommon.StartCloudMqtt ();
+ if (UserConfig.Instance.CheckHomeGateways ()) {
+ if (!string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways[0].GatewayUniqueId)) {
+ Shared.SimpleControl.CommonPage.IsRemote = true;
+ await SmartHome.MqttCommon.StartCloudMqtt ();
+ }
}
}
}
--
Gitblit v1.8.0