全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -290,8 +290,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 +301,8 @@
            {

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

            }

            if (clearError == true)

            {

                //错误信息

                btnError.Text = string.Empty;

            }

            //错误信息

            btnError.Text = string.Empty;

        }



        #endregion

@@ -324,6 +320,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