Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-08 41b934c1780d1a18fe8068f3bfc0e59b3b892479

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -202,6 +202,7 @@
            btnIcon.MouseUpEventHandler += (sender, e) =>
            {


                //ESOnVideo.Current.Test(false);

                //return;
@@ -243,13 +244,14 @@
                    //etAccount.Text = "info@smartlife-ks.com";
                    //etAccount.Text = "551775569@qq.com";//wcf
                    etAccount.Text = "15626203746";
                    etAccount.Text = "zhangquansongjava@163.com";
                    //etAccount.Text = "zhangquansongjava@163.com";
                    //etAccount.Text = "s.savinov@hdlautomation.ru";
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "zhangquansongjava@163.com")
                if(etAccount.Text == "s.savinov@hdlautomation.ru")
                {
                    etPassword.Text = "BVVEAAMZ";
                    etPassword.Text = "BWGVOFCJ";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;