Merge branch 'dev' into lss

lss

2022-05-17 49248e3bdff0458f8f6f4156d1425bd6f6074e32

 HDL_ON/UI/UI1-Login/LoginPage.cs

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


                //ESOnVideo.Current.Test(false);

                //return;
@@ -212,11 +213,10 @@
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
                    //etAccount.Text = "13226233133";//豆豆
                    //etAccount.Text = "18316672920";
                    etAccount.Text = "18316672920";
                    //etAccount.Text = "18316120654";//tujie
                    //etAccount.Text = "15626203746";
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                    etAccount.Text = "18059593333";
                    etAccount.Text = "18244942707";
                }
                else
                {
@@ -235,7 +235,7 @@
                    //etAccount.Text = "18598273624";
                    etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "18814122445";//董泽斌 天河办公室
                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    etAccount.Text = "18402017839";//wjc
                    //etAccount.Text = "13430286286";//cwc
                    //etAccount.Text = "13709260805";
@@ -243,19 +243,22 @@
                    //etAccount.Text = "13375012441";
                    //etAccount.Text = "info@smartlife-ks.com";
                    //etAccount.Text = "551775569@qq.com";//wcf
                    etAccount.Text = "15626203746";
                    //etAccount.Text = "zhangquansongjava@163.com";
                    //etAccount.Text = "s.savinov@hdlautomation.ru";
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "tf@smarttech.com.ua")
                if(etAccount.Text == "s.savinov@hdlautomation.ru")
                {
                    etPassword.Text = "Smart2021";
                    etPassword.Text = "BWGVOFCJ";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;
            };
#endif

#region 登录方式选择
            #region 登录方式选择
            btnPhoneLogin = new Button()
            {
                X = Application.GetRealWidth(28),