完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

 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);

@@ -124,6 +128,9 @@
            btnIp.TextSize = 12;

            btnIp.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnIp, ChidrenBindMode.BindEventOnly);



            //初始值在线

            this.IsOnline = true;

        }



        #endregion