From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 09 五月 2023 09:11:18 +0800 Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch --- HDL_ON/UI/UI1-Login/LoginPage.cs | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs index d290c12..280000b 100644 --- a/HDL_ON/UI/UI1-Login/LoginPage.cs +++ b/HDL_ON/UI/UI1-Login/LoginPage.cs @@ -22,6 +22,13 @@ Application.HideSoftInput(); }; pm = new HttpServerRequest(); + + BaseActivity.HideKeyboardEvent = () => { + Application.RunOnMainThread(() => + { + this.Y = 0; + }); + }; } public override void RemoveFromParent() @@ -32,6 +39,11 @@ waitPage.RemoveFromParent(); waitPage = null; } + + + BaseActivity.HideKeyboardEvent = () => { + + }; base.RemoveFromParent(); @@ -190,6 +202,9 @@ UnSelectedImagePath = "Public/Logo-bg.png" }; bodyView.AddChidren(btnIcon_bg); + btnIcon_bg.MouseDownEventHandler += (sender, e) => { + Application.HideSoftInput(); + }; #if DEBUG btnIcon_bg.MouseUpEventHandler += (sender, e) => @@ -230,11 +245,13 @@ //etAccount.Text = "18244942707"; //etAccount.Text = "12345678904"; //etAccount.Text = "13418062953"; - //etAccount.Text = "13138683659"; + etAccount.Text = "13138683659"; //etAccount.Text = "15217626103"; //etAccount.Text = "18100573477"; //etAccount.Text = "18321091245"; - etAccount.Text = "13751916353"; + //etAccount.Text = "13751916353"; + etAccount.Text = "13549566666"; + etAccount.Text = "18316672920"; } else { @@ -286,9 +303,9 @@ else if (etAccount.Text == "18100573477") { etPassword.Text = "huang12345"; - }else if(etAccount.Text == "13751916353") + }else if(etAccount.Text == "13549566666") { - etPassword.Text = "hdl1985"; + etPassword.Text = "12345678"; } //etPassword.Text = "Hdl85521566"; btnLogin.IsSelected = true; @@ -1090,7 +1107,7 @@ // new AttrKeyConfig (){ // key = "pm2.5", // type = "interval" , - // unit = "ug/m虏", + // unit = "ug/m鲁", // configs = new List<AttrKeyInfo>(){ // new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"}, // new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"}, -- Gitblit v1.8.0