Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -20,9 +20,13 @@
        /// </summary>

        public Action<string> FinishInputEvent = null;

        /// <summary>

        /// 密码输入类型

        /// 密码输入类型(它与NumberInputOnly不共存)

        /// </summary>

        public bool SecureTextEntry = false;

        /// <summary>

        /// 输入键盘指定为数字键盘(默认为true,它与SecureTextEntry不共存)

        /// </summary>

        public bool NumberInputOnly = true;

        /// <summary>

        /// 验证码长度

        /// </summary>

@@ -74,6 +78,10 @@
                {

                    txtCode.SecureTextEntry = true;

                }

                else if (NumberInputOnly == true)

                {

                    txtCode.IsNumberKeyboardType = true;

                }

                txtCode.Name = i.ToString();

                txtCode.TextAlignment = TextAlignment.Center;

                frameCode.AddChidren(txtCode);