Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs

@@ -58,12 +58,15 @@
            };
            bodyView.AddChidren(btnTipTitle);


            if (optionType == "2" || optionType == "3")
            if (optionType == "1")
            {
                btnTipTitle.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.PlsEntryPassword : StringId.PlsRegisterRepeatPassword;
            }
            else if (optionType == "2")
            {
                btnTipTitle.TextID = StringId.PleaseEnterTheOriginalDigitalPassword;
            }
            if (optionType == "7")
            else
            {
                btnTipTitle.TextID = StringId.PlsEntryPassword;
            }
@@ -227,18 +230,16 @@

            etPassword.Foucs = true;

            //加载底部验证按钮
            if (optionType == "3" || optionType == "5" || optionType == "6")
            {
                //输入登录密码验证 提示按钮
                AddInputPasswordTipButton(optionType);
            }
            else if (optionType == "7")
            if (optionType == "7")
            {
                //使用账户密码登录按钮 提示按钮
                AddLoginTipButton();
            }

            else if (optionType != "1")
            {
                //输入登录密码验证 提示按钮
                AddInputPasswordTipButton(optionType);
            }
        }