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/HideOption/HideOptionGatewayListForm.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
index 5380257..23a6432 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 HdlGatewayResourse.DicReceiveGatewayTest.Values)
+ {
+ listway.Add(way);
+ }
}
for (int i = 0; i < listway.Count; i++)
{
@@ -111,17 +124,12 @@
btnLink.TextSize = 12;
btnLink.X = gatewayRow.btnIp.Right;
btnLink.Y = gatewayRow.btnIp.Y;
- btnLink.Text = "鏈湴杩炴帴:" + i_gateway.localIsConnected.ToString();
+ btnLink.Text = "鏈湴杩炴帴:" + i_gateway.LocalIsConnected.ToString();
gatewayRow.frameTable.AddChidren(btnLink);
//瀹氫綅
- var btnPosition = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
- btnPosition.BackgroundColor = 0xff4a4a4a;
- btnPosition.TextAlignment = TextAlignment.Center;
- btnPosition.TextColor = UserCenterColor.Current.White;
- btnPosition.TextSize = 12;
+ var btnPosition = gatewayRow.AddEditorControl(false);
btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
- gatewayRow.AddRightView(btnPosition);
btnPosition.ButtonClickEvent += (sender, e) =>
{
//鍙戦�佸畾浣嶅懡浠�
@@ -129,7 +137,7 @@
};
gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
{
- var form = new GatewayManage.GatewayInfoEditorForm();
+ var form = new HideOptionGatewayInfoMenuForm();
form.AddForm(i_gateway);
};
}
--
Gitblit v1.8.0