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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs

@@ -83,6 +83,7 @@
            this.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);

            this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(75), false);

            btnTitle.Text = i_title;

            btnTitle.IsBold = true;

        }



        /// <summary>

@@ -290,8 +291,7 @@
        /// 重置控件

        /// </summary>

        /// <param name="i_title">标题信息</param>

        /// <param name="clearError">是否清除错误信息</param>

        public void ResetControlInfo(string i_title, bool clearError = true)

        public void ResetControlInfo(string i_title)

        {

            //标题

            btnTitle.Text = i_title;

@@ -302,11 +302,8 @@
            {

                listPswIcon[i].BackgroundColor = UserCenterColor.Current.Transparent;

            }

            if (clearError == true)

            {

                //错误信息

                btnError.Text = string.Empty;

            }

            //错误信息

            btnError.Text = string.Empty;

        }



        #endregion

@@ -324,6 +321,14 @@
                btnError.Visible = true;

            }

            btnError.Text = i_msg;



            //记录的密码

            inputPassword = string.Empty;

            //密码图标

            for (int i = 0; i < listPswIcon.Count; i++)

            {

                listPswIcon[i].BackgroundColor = UserCenterColor.Current.Transparent;

            }

        }



        #endregion