Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 a56a485926a8927f904d7f4795c371c25b35753a

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -14,6 +14,10 @@
            //bodyView = new FrameLayout();
            //AddChidren(bodyView);
            bodyView = this;
            //2020-12-22 增加点击隐藏键盘事件
            bodyView.MouseDownEventHandler += (sender, e) => {
                Application.HideSoftInput();
            };
            pm = new HttpServerRequest();
        }

@@ -25,10 +29,11 @@
                waitPage.RemoveFromParent();
                waitPage = null;
            }
            else
            {
                base.RemoveFromParent();
            }

            base.RemoveFromParent();

            ////2020-12-22 增加点击隐藏键盘事件
            //Application.HideSoftInput();
        }

        #region 局部变量
@@ -192,7 +197,7 @@
                }
                else
                {
                    etAccount.Text = "18824864143";
                    etAccount.Text = "13375012446";//13375012446
                }
                b = !b;
                etPassword.Text = "123456";
@@ -509,7 +514,7 @@
        /// <param name="frameBack"></param>
        private void AddServiceAgreementControl(FrameLayout frameLayout)
        {
            isAgreePrivacyPolicy = UserInfo.Current.isAgreePrivacyPolicy;
            isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;
            var frameRow = new FrameLayout()
            {
                Height = Application.GetRealHeight(28),
@@ -541,8 +546,8 @@
            {
                isAgreePrivacyPolicy = !isAgreePrivacyPolicy;
                agreeBtn.IsSelected = isAgreePrivacyPolicy;
                UserInfo.Current.isAgreePrivacyPolicy = isAgreePrivacyPolicy;
                UserInfo.Current.SaveUserInfo();
                OnAppConfig.Instance.isAgreePrivacyPolicy = isAgreePrivacyPolicy;
                OnAppConfig.Instance.SaveConfig();
            };

            agreeBtn.MouseUpEventHandler = eventHandler;