全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -37,6 +37,10 @@
        /// </summary>

        public NormalViewControl btnName = null;

        /// <summary>

        /// 图标控件

        /// </summary>

        public IconViewControl btnIcon = null;

        /// <summary>

        /// 显示IP控件

        /// </summary>

        private NormalViewControl btnIp = null;

@@ -82,7 +86,7 @@
            var tempWay = this.zbGateway;



            //图标

            var btnIcon = frameTable.AddLeftIcon(iconSize);

            this.btnIcon = frameTable.AddLeftIcon(iconSize);

            if (tempWay != null)

            {

                HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, tempWay);

@@ -117,13 +121,20 @@
            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;

            btnIp.TextSize = 12;

            btnIp.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnIp, ChidrenBindMode.BindEventOnly);



            //初始值在线

            this.IsOnline = true;

        }



        #endregion