From 587c36e27131f2d028fcabc13b296a8de7470034 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 08:59:19 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
index 35a290a..e9cd431 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
@@ -65,7 +65,14 @@
rowSerial.UseClickStatu = false;
listView.AddChidren(rowSerial);
rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 300);
- rowSerial.AddMostRightView("", 600);
+ if (i_gateway.getGwInfo == null)
+ {
+ rowSerial.AddMostRightView("000000000000", 600);
+ }
+ else
+ {
+ rowSerial.AddMostRightView(string.IsNullOrEmpty(i_gateway.getGwInfo.GWSN) == false ? i_gateway.getGwInfo.GWSN : "000000000000", 600);
+ }
rowSerial.AddBottomLine();
//缃戝叧ID
@@ -89,7 +96,7 @@
rowMac.UseClickStatu = false;
listView.AddChidren(rowMac);
rowMac.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorMac), 300);
- rowMac.AddMostRightView("", 600);
+ var btnMac = rowMac.AddMostRightView("", 600);
rowMac.AddBottomLine();
//鍗忚鍣ㄤ俊閬�
@@ -97,7 +104,7 @@
rowChannel.UseClickStatu = false;
listView.AddChidren(rowChannel);
rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
- rowChannel.AddMostRightView("", 600);
+ var btnChannel = rowChannel.AddMostRightView("", 600);
rowChannel.AddBottomLine();
//鍗忚鍣≒anID
@@ -105,7 +112,7 @@
rowPanid.UseClickStatu = false;
listView.AddChidren(rowPanid);
rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
- rowPanid.AddMostRightView("", 600);
+ var btnPanId = rowPanid.AddMostRightView("", 600);
rowPanid.AddBottomLine();
//鍒堕�犲晢
@@ -116,6 +123,62 @@
rowProtuct.AddMostRightView("HDL", 600);
listView.AdjustRealHeight(Application.GetRealHeight(23));
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇缃戝叧鏁版嵁
+ this.GetGatewayData(i_gateway, btnMac, btnChannel, btnPanId);
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇鏁版嵁___________________________
+
+ /// <summary>
+ /// 鑾峰彇缃戝叧鏁版嵁
+ /// </summary>
+ /// <param name="gateway">缃戝叧瀵硅薄</param>
+ /// <param name="btnMac">鍗忚皟鍣∕AC</param>
+ /// <param name="btnChannel">鍗忚皟鍣ㄤ俊閬�</param>
+ /// <param name="btnPanid">鍗忚皟鍣≒anId</param>
+ private void GetGatewayData(ZbGateway gateway, NormalViewControl btnMac, NormalViewControl btnChannel, NormalViewControl btnPanid)
+ {
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍗忚皟鍣∕AC
+ string strMac = HdlGatewayLogic.Current.GetGatewayCoordinatorMac(gateway);
+ if (strMac == null)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return;
+ }
+ //鍗忚皟鍣ㄤ俊閬�
+ int intChannel = HdlGatewayLogic.Current.GetGatewayChannelId(gateway);
+ if (intChannel == -1)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return;
+ }
+ //鍗忚皟鍣≒anId
+ int intPanId = HdlGatewayLogic.Current.GetGatewayPanId(gateway);
+ if (intPanId == -1)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return;
+ }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnMac.Text = strMac;
+ btnChannel.Text = intChannel.ToString();
+ btnPanid.Text = intPanId.ToString();
+ });
}
#endregion
--
Gitblit v1.8.0