From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001 From: lss <316519258@qq.com> Date: 星期五, 12 六月 2020 09:22:04 +0800 Subject: [PATCH] 2020.06.12 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs index eaa2e2a..414fc0d 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs @@ -77,7 +77,7 @@ /// <param name="ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param> public GatewayRowControl(ZbGateway i_zbGateway, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis) { - this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(i_zbGateway); + this.zbGatewayId = i_zbGateway.GwId; } /// <summary> @@ -121,20 +121,20 @@ btnName.TextSize = 15; //杩欎釜鍧愭爣鏈夌偣鐗规畩 btnName.Y = Application.GetRealHeight(12) + this.chidrenYaxis; - frameTable.AddChidren(btnName, ChidrenBindMode.BindEventOnly); + frameTable.AddChidren(btnName, ChidrenBindMode.BindEvent); //鎴块棿 string strIp = string.Empty; if (tempWay != null) { - strIp = tempWay.getGatewayBaseInfo.IpAddress; + strIp = tempWay.GwIP; } this.btnIp = frameTable.AddLeftCaption(strIp, 600, 50, true); //杩欎釜鍧愭爣鏈夌偣鐗规畩 btnIp.Y = Application.GetRealHeight(72) + this.chidrenYaxis; btnIp.TextSize = 12; btnIp.TextColor = UserCenterColor.Current.TextGrayColor1; - frameTable.AddChidren(btnIp, ChidrenBindMode.BindEventOnly); + frameTable.AddChidren(btnIp, ChidrenBindMode.BindEvent); //鍒濆鍊煎湪绾� this.IsOnline = true; @@ -152,7 +152,7 @@ { if (zbway != null) { - this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(zbway); + this.zbGatewayId = zbway.GwId; } bool bonline = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway); -- Gitblit v1.8.0