Merge branch 'dev' into lss

lss

2022-05-17 ae86b09b30621e1a8512c6bcdd7e22e9c67a5402

 HDL_ON/UI/UI1-Login/LoginPage.cs

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


                //ESOnVideo.Current.Test(false);

                //return;
@@ -215,7 +216,7 @@
                    etAccount.Text = "18316672920";
                    //etAccount.Text = "18316120654";//tujie
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                    //etAccount.Text = "18140004933";
                    etAccount.Text = "18244942707";
                }
                else
                {
@@ -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;