From 965290476c027deb96891cde1095d9a100581a6b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 20 二月 2020 09:13:32 +0800
Subject: [PATCH] 2020-02-20 1.优化更新。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
index a12edd8..46bbfd3 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
@@ -6,6 +6,7 @@
{
public class GuideSettingGateway : FrameLayout
{
+
static byte TYPEStandardMQTT = 5;
static byte TYPEHdlMQTT = 4;
static GuideSettingGateway curView;
@@ -247,6 +248,8 @@
this.AddChidren (myLoading);
//myLoading.Start ("鐐瑰嚮灞忓箷鍏抽棴閰嶉妯″紡");
myLoading.Start ("Searching, Please touch the here to exit the searching mode.");
+ //myLoading.Start ("Waiting for new device, Please touch the here to exit the waiting mode.");
+
this.AddChidren (btnCloseLoading);
}
});
@@ -526,6 +529,11 @@
}) { IsBackground = true }.Start ();
}
+ ///// <summary>
+ ///// 2020-02-11
+ ///// 鎼滅储閲嶅娆℃暟 鐢�4娆″鍔犱负6娆�
+ ///// </summary>
+ //static readonly int READ_COUNT = 6;
/// <summary>
/// 璇诲彇璁惧
/// </summary>
@@ -539,7 +547,8 @@
CommonPage.DeviceList.Clear ();
CommonPage.searchTotal = 0;
//濡傛灉涓ゆ閮芥病鏈夋暟鎹弽棣堬紝灏变笉璇诲彇
- int readCount = 4;
+ //2020 - 02 - 11鎼滅储閲嶅娆℃暟 鐢�4娆″鍔犱负6娆�
+ int readCount = 6;
while (0 < readCount) {
readCount--;
var ms = new System.IO.MemoryStream ();
@@ -574,7 +583,7 @@
System.Threading.Thread.Sleep (1000);
//濡傛灉鏁伴噺涓嶇浉绛夛紝灏遍噸缃鏁�
if (tempCount != CommonPage.DeviceList.Count) {
- readCount = 4;
+ readCount = 6;
}
}
CommonPage.DeviceList = CommonPage.DeviceList.FindAll ((obj) => { return obj != null && obj.SubnetID == gatewayDeicve.SubnetID; });
@@ -671,7 +680,7 @@
var mobytes = Control.ControlBytesSendHasReturn (Command.SetGateWayModelInternetInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, serverIPBytes);
if (mobytes == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline),
+ new Alert ("", ErrorCode.GatewayNoResponse,
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
} else if (mobytes [0] == 0xF5) {
@@ -684,7 +693,7 @@
var bindReginIdStatus = Control.ControlBytesSendHasReturn (Command.Write_APP_Data_STORE_1D5E_CMD, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, currentRegionIdBytes);
if (bindReginIdStatus == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ new Alert ("", ErrorCode.GatewayNoResponse, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return;
} else if (bindReginIdStatus [0] != 0xF8) {
@@ -723,7 +732,7 @@
byte [] gatewayBytes = null;
string [] strServerIP = (MainPage.SeviceIP).Split ('.');
string [] strServerIP1 = (MainPage.SeviceIP).Split ('.');
- MainPage.Loading.Start ("Configuring device...");
+ MainPage.Loading.Start ("Configuring gateway...");
System.Threading.Tasks.Task.Run (() => {
try {
@@ -777,7 +786,8 @@
} catch (Exception ex) {
Console.WriteLine (ex.Message);
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ //淇敼缃戝叧杩炴帴妯″紡澶辫触
+ new Alert ("", "Failed to modify gateway connection mode!", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
bool canRemove = false;
} finally {
@@ -834,7 +844,7 @@
byte [] backBytes = Control.ControlBytesSendHasReturn (Command.SetGateWayAdminInfo, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, adminBytes);
- return CheckIsSuccessfulWithBytes (backBytes);
+ return CheckIsSuccessfulWithBytes (backBytes, "Failed to modify gateway administrator information!");
}
/// <summary>
@@ -842,11 +852,11 @@
/// </summary>
/// <param name="backBytes"></param>
/// <returns></returns>
- private bool CheckIsSuccessfulWithBytes (byte [] backBytes)
+ private bool CheckIsSuccessfulWithBytes (byte [] backBytes, string errorStr = "Modify gateway configuration failed!")
{
if (backBytes == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline),
+ new Alert ("", ErrorCode.GatewayNoResponse,
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return false;
@@ -854,7 +864,7 @@
return true;
} else {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.OperationFailed),
+ new Alert ("", errorStr,
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return false;
@@ -879,7 +889,7 @@
var bindReginIdStatus = Control.ControlBytesSendHasReturn (Command.Write_APP_Data_STORE_1D5E_CMD, gatewayDeicve.SubnetID, gatewayDeicve.DeviceID, sendBytes);
if (bindReginIdStatus == null) {
Application.RunOnMainThread (() => {
- new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ new Alert ("", ErrorCode.GatewayNoResponse, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
return;
} else if (bindReginIdStatus [0] != 0xF8) {
@@ -904,7 +914,7 @@
void BindGatewaysNew ()
{
Application.RunOnMainThread (() => {
- MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up.Please wait...");
+ MainPage.Loading.Start ("Gateway setting succeeded锛宒ata up. Please wait...");
});
IO.FileUtils.SaveEquipmentMessage (gatewayDeicve);
var gatewayMAC = gatewayDeicve.MAC.Replace (".", "");
--
Gitblit v1.8.0