Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

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

@@ -23,6 +23,7 @@
        public AppUnlockPasswordPage(string pw, Action action)
        {
            bodyView = this;
            bodyView.Tag = "unlockpage";
            oldPasswrod = pw;
            backAction = action;
        }
@@ -146,7 +147,7 @@
            etPassword = new EditText()
            {
                Y = Application.GetRealWidth(100),
                Height = Application.GetRealWidth(0),
                Height = 1,
                Foucs = true,
                //Visible = false,
                IsNumberKeyboardType = true,