合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

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

@@ -48,7 +48,7 @@
            btnIcon.ButtonClickEvent += (sender, e) =>

            {

                //测试

                HdlGatewayLogic.Current.SetTestCommand(i_zbGateway);

                HdlGatewayLogic.Current.SetFixedPositionCommand(i_zbGateway);

            };



            //初始化中部控件

@@ -146,7 +146,7 @@


            //网关类型

            caption = Language.StringByID(R.MyInternationalizationString.uGatewayType);

            nameValue = HdlGatewayLogic.Current.GetGatewayImageText(this.zbGateway);

            //nameValue = HdlGatewayLogic.Current.GetGatewayImageText(this.zbGateway);

            var btnObject = new FrameCaptionViewControl(caption, nameValue);

            listDeviceControl.AddChidren(btnObject);

            btnObject.InitControl();