请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs

@@ -111,11 +111,17 @@
        {

            if (e.Focus == false)

            {

                btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;

                if (btnLineTemp != null)

                {

                    btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;

                }

            }

            else

            {

                btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;

                if (btnLineTemp != null)

                {

                    btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;

                }

            }

        }



@@ -135,7 +141,7 @@
                return;

            }

            //Y轴重置

            this.Y = UserCenterLogic.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);

            this.Y = HdlControlLogic.Current.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);

        }

        #endregion

    }