Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs

@@ -121,7 +121,11 @@
            frameTable.AddChidren(btnName, ChidrenBindMode.BindEventOnly);



            //房间

            string strIp = HdlGatewayLogic.Current.GetGatewayBaseInfoAttribute(tempWay, "IpAddress").ToString();

            string strIp = string.Empty;

            if (tempWay != null)

            {

                strIp = tempWay.getGatewayBaseInfo.IpAddress;

            }

            this.btnIp = frameTable.AddLeftCaption(strIp, 600, 50, true);

            //这个坐标有点特殊

            btnIp.Y = Application.GetRealHeight(72) + this.chidrenYaxis;