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

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputExControl.cs

@@ -33,7 +33,7 @@
        public TextInputExControl(int i_Width, int i_Height, bool real = false)
        {
            this.InitSize(i_Width, i_Height, real);
            this.TextColor = UserCenterColor.Current.TextGrayColor;

            this.TextColor = UserCenterColor.Current.TextGrayColor3;



            this.TextChangeEventHandler += this.TextChangeEvent;
            this.EditorEnterAction += this.EditorEnterEvent;
@@ -47,7 +47,7 @@
        public TextInputExControl(int i_Width, bool real = false)
        {

            this.InitSize(i_Width, real);

            this.TextColor = UserCenterColor.Current.TextGrayColor;
            this.TextColor = UserCenterColor.Current.TextGrayColor3;

            this.TextChangeEventHandler += this.TextChangeEvent;
            this.EditorEnterAction += this.EditorEnterEvent;
@@ -63,7 +63,7 @@
        /// <param name="view"></param>

        private void EditorEnterEvent(View view)

        {

            this.TextColor = UserCenterColor.Current.TextGrayColor;

            this.TextColor = UserCenterColor.Current.TextGrayColor3;

            this.IsTextBlack = false;

            this.FinishInputEvent?.Invoke();

        }