From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs
index 64412de..cc9c284 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs
@@ -85,6 +85,14 @@
private void AddGatewayRow(VerticalListControl listView, ZbGateway gateway, bool addLine)
{
string gwid = HdlGatewayLogic.Current.GetGatewayId(gateway);
+ if (this.dicZbGatewayDiv[gwid] != 2)
+ {
+ //濡傛灉鏈湴娌℃湁,閭ｄ箞搴旇鏄湪涔嬪悗鐨勭紪杈戠晫闈㈠垹闄や簡
+ if (HdlGatewayLogic.Current.IsGatewayExist(gwid) == false)
+ {
+ return;
+ }
+ }
var frameRow = new RowLayoutControl(listView.rowSpace / 2);
listView.AddChidren(frameRow);
@@ -112,6 +120,11 @@
//搴曠嚎
frameRow.frameTable.AddBottomLine();
}
+ frameRow.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new GatewayProductInfoForm();
+ form.AddForm(gateway);
+ };
if (dicZbGatewayDiv[gwid] == 2)
{
--
Gitblit v1.8.0