From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
index 23a6432..b6ad0bf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
@@ -85,7 +85,7 @@
else
{
listway = new List<ZbGateway>();
- foreach (var way in HdlGatewayResourse.DicReceiveGatewayTest.Values)
+ foreach (var way in UserCenterResourse.DicReceiveGatewayTest.Values)
{
listway.Add(way);
}
@@ -124,7 +124,7 @@
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);
//瀹氫綅
--
Gitblit v1.8.0