Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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

old mode 100755
new mode 100644
@@ -186,8 +186,13 @@
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                BackgroundColor = CSS_Color.MainBackgroundColor,
                TextID = StringId.MultipleChoicesOfPagesYouNeedToProtect,
                IsMoreLines = true,
            };
            topContentView.AddChidren(btnTip2);
            if(Language.CurrentLanguage == "Engligh")
            {
                btnTip2.Height = Application.GetRealHeight(30);
            }


            optionView = new HorizontalScrolViewLayout()
@@ -216,6 +221,11 @@
                TextID = StringId.UnprotectedTipMsg,
            };
            topContentView.AddChidren(btnTipMsg);
            if (Language.CurrentLanguage == "Engligh")
            {
                btnTip2.Height = Application.GetRealHeight(40);
                topContentView.Height = Application.GetRealHeight(360);
            }

            LoadEventList();