合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs

@@ -268,7 +268,7 @@
            {

                i_width = Application.GetRealWidth(i_width);

            }

            var btnContr = AddMostRightView(i_text, i_width, ControlCommonResourse.NormalControlHeight, false);

            var btnContr = AddMostRightView(i_text, i_width, this.Height, false);

            this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);

            if (chidrenYaxis != 0)

            {

@@ -295,7 +295,7 @@
            }

            var btnContr = new NormalViewControl(i_width, i_height, false);

            btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;

            btnContr.Height = this.Height;

            btnContr.Height = i_height;

            btnContr.TextAlignment = TextAlignment.CenterRight;

            btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnContr.Text = i_text;