合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs

@@ -107,6 +107,13 @@
                gatewayRow.frameTable.AddBottomLine();

            }



            var btnLink = new NormalViewControl(Application.GetRealWidth(700), gatewayRow.btnIp.Height, false);

            btnLink.TextSize = 12;

            btnLink.X = gatewayRow.btnIp.Right;

            btnLink.Y = gatewayRow.btnIp.Y;

            btnLink.Text = "本地连接:" + i_gateway.localIsConnected.ToString();

            gatewayRow.frameTable.AddChidren(btnLink);



            //定位

            var btnPosition = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);

            btnPosition.BackgroundColor = 0xff4a4a4a;