From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
index 721cc9c..39c627f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
@@ -24,13 +24,18 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_GatewayDiv">缃戝叧鍖哄垎,1:鏈湴缃戝叧 2:骞挎挱鎼滃埌鐨勭綉鍏�</param>
+ /// <param name="i_GatewayDiv">缃戝叧鍖哄垎,1:鏈湴缃戝叧 2:缂撳瓨涓殑缃戝叧 3:骞挎挱鎼滃埌鐨勭綉鍏�</param>
public void ShowForm(int i_GatewayDiv)
{
if (i_GatewayDiv == 1)
{
//璁剧疆鏍囬淇℃伅
base.SetTitleText("鏈湴缃戝叧");
+ }
+ else if (i_GatewayDiv == 2)
+ {
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText("缂撳瓨涓殑缃戝叧");
}
else
{
@@ -73,9 +78,17 @@
//鑾峰彇鏈湴鍏ㄩ儴缃戝叧瀵硅薄
listway = HdlGatewayLogic.Current.GetAllLocalGateway();
}
- else
+ else if (i_GatewayDiv == 2)
{
listway = ZbGateway.GateWayList;
+ }
+ else
+ {
+ listway = new List<ZbGateway>();
+ foreach (var way in UserCenterResourse.DicReceiveGatewayTest.Values)
+ {
+ listway.Add(way);
+ }
}
for (int i = 0; i < listway.Count; i++)
{
@@ -107,6 +120,13 @@
gatewayRow.frameTable.AddBottomLine();
}
+ var btnLink = new NormalViewControl(Application.GetRealWidth(700), gatewayRow.btnIp.Height, false);
+ btnLink.TextSize = 12;
+ btnLink.X = gatewayRow.btnIp.Right;
+ btnLink.Y = gatewayRow.btnIp.Y;
+ btnLink.Text = "鏈湴杩炴帴:" + i_gateway.localIsConnected.ToString();
+ gatewayRow.frameTable.AddChidren(btnLink);
+
//瀹氫綅
var btnPosition = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
btnPosition.BackgroundColor = 0xff4a4a4a;
--
Gitblit v1.8.0