From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs | 108 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 84 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
index 35a290a..fcebab3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
@@ -65,7 +65,7 @@
rowSerial.UseClickStatu = false;
listView.AddChidren(rowSerial);
rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 300);
- rowSerial.AddMostRightView("", 600);
+ rowSerial.AddMostRightView(string.IsNullOrEmpty(i_gateway.GwSerialNum) == false ? i_gateway.GwSerialNum : "000000000000", 600);
rowSerial.AddBottomLine();
//缃戝叧ID
@@ -73,7 +73,7 @@
rowGatewayID.UseClickStatu = false;
listView.AddChidren(rowGatewayID);
rowGatewayID.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uGatewayID), 300);
- rowGatewayID.AddMostRightView(HdlGatewayLogic.Current.GetGatewayId(i_gateway), 600);
+ rowGatewayID.AddMostRightView(i_gateway.GwId, 600);
rowGatewayID.AddBottomLine();
//缃戝叧IP
@@ -81,7 +81,7 @@
rowGatewayIP.UseClickStatu = false;
listView.AddChidren(rowGatewayIP);
rowGatewayIP.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uGatewayIP), 300);
- rowGatewayIP.AddMostRightView(i_gateway.getGatewayBaseInfo.IpAddress, 600);
+ rowGatewayIP.AddMostRightView(i_gateway.GwIP, 600);
rowGatewayIP.AddBottomLine();
//鍗忚鍣∕AC
@@ -89,35 +89,95 @@
rowMac.UseClickStatu = false;
listView.AddChidren(rowMac);
rowMac.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorMac), 300);
- rowMac.AddMostRightView("", 600);
+ var btnMac = rowMac.AddMostRightView("", 600);
rowMac.AddBottomLine();
- //鍗忚鍣ㄤ俊閬�
- var rowChannel = new FrameRowControl(listView.rowSpace / 2);
- rowChannel.UseClickStatu = false;
- listView.AddChidren(rowChannel);
- rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
- rowChannel.AddMostRightView("", 600);
- rowChannel.AddBottomLine();
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉挎垨鑰呰櫄鎷熶綇瀹�,鍒欎笉澶勭悊
+ if (Common.Config.Instance.Home.IsShowTemplate == false
+ && Common.Config.Instance.Home.IsVirtually == false)
+ {
+ //鍗忚鍣ㄤ俊閬�
+ var rowChannel = new FrameRowControl(listView.rowSpace / 2);
+ rowChannel.UseClickStatu = false;
+ listView.AddChidren(rowChannel);
+ rowChannel.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorChannel), 300);
+ var btnChannel = rowChannel.AddMostRightView("", 600);
+ rowChannel.AddBottomLine();
- //鍗忚鍣≒anID
- var rowPanid = new FrameRowControl(listView.rowSpace / 2);
- rowPanid.UseClickStatu = false;
- listView.AddChidren(rowPanid);
- rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
- rowPanid.AddMostRightView("", 600);
- rowPanid.AddBottomLine();
+ //鍗忚鍣≒anID
+ var rowPanid = new FrameRowControl(listView.rowSpace / 2);
+ rowPanid.UseClickStatu = false;
+ listView.AddChidren(rowPanid);
+ rowPanid.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinatorPanid), 300);
+ var btnPanId = rowPanid.AddMostRightView("", 600);
+ rowPanid.AddBottomLine();
- //鍒堕�犲晢
- var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
- rowProtuct.UseClickStatu = false;
- listView.AddChidren(rowProtuct);
- rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
- rowProtuct.AddMostRightView("HDL", 600);
+ //鍒堕�犲晢
+ var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
+ rowProtuct.UseClickStatu = false;
+ listView.AddChidren(rowProtuct);
+ rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
+ rowProtuct.AddMostRightView("骞垮窞娌充笢绉戞妧鏈夐檺鍏徃", 600);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇缃戝叧鏁版嵁
+ this.GetGatewayData(i_gateway, btnMac, btnChannel, btnPanId);
+ });
+ }
listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#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();
+ return;
+ }
+ //鍗忚皟鍣ㄤ俊閬�
+ int intChannel = HdlGatewayLogic.Current.GetGatewayChannelId(gateway);
+ if (intChannel == -1)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
+ }
+ //鍗忚皟鍣≒anId
+ int intPanId = HdlGatewayLogic.Current.GetGatewayPanId(gateway);
+ if (intPanId == -1)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
+ }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnMac.Text = strMac;
+ btnChannel.Text = intChannel.ToString();
+ btnPanid.Text = intPanId.ToString();
+ });
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0