From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs
index d05fd90..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);
--
Gitblit v1.8.0