2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -192,11 +192,11 @@
                //return;
                if (b)
                {
                    etAccount.Text = "13415629083";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
                    etAccount.Text = "18778381374";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
                }
                else
                {
                    etAccount.Text = "13375012446";//13375012446
                    etAccount.Text = "13375012446";//13375012446//13602944661//tzy 18778381374
                }
                b = !b;
                etPassword.Text = "123456";
@@ -526,9 +526,13 @@
            {
                Height = Application.GetRealHeight(28),
                Width = Application.GetRealWidth(28),
                X = Application.GetRealWidth(82),
                X = Application.GetRealWidth(22),
            };
            frameRow.AddChidren(agreeView);
            if(Language.CurrentLanguage == "Chinese")
            {
                agreeView.X = Application.GetRealWidth(82);
            }
            //同意图标按钮
            var agreeBtn = new Button()
            {