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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs

@@ -218,14 +218,14 @@
            }



            //当前网关的角标

            //if (strWayId == GatewayResourse.AppOldSelectGatewayId)

            //{

            //    var btnNow = new IconViewControl(52);

            //    btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;

            //    btnNow.UnSelectedImagePath = "Item/NowAcctionTip.png";

            //    btnNow.X = gatewayRow.btnName.X + gatewayRow.btnName.GetRealWidthByText(15);

            //    gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEventOnly);

            //}

            if (strWayId == GatewayResourse.AppOldSelectGatewayId)

            {

                var btnNow = new IconViewControl(52);

                btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;

                btnNow.UnSelectedImagePath = "Item/NowAcctionTip.png";

                btnNow.X = gatewayRow.btnName.X + gatewayRow.btnName.GetRealWidthByText();

                gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEventOnly);

            }

        }



        #endregion