From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 6460067..8c22dc5 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -165,8 +165,6 @@
/// </summary>
public void LoadView(UserInfo userInfo = null)
{
- Language.CurrentLanguage = "Chinese";
-
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -191,13 +189,14 @@
bool b = false;
btnIcon.MouseUpEventHandler += (sender, e) =>
{
+ //return;
if (b)
{
- etAccount.Text = "18824864143";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ etAccount.Text = "18778381374";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
}
else
{
- etAccount.Text = "13602944661";//13375012446
+ etAccount.Text = "13375012446";//13375012446//13602944661//tzy 18778381374
}
b = !b;
etPassword.Text = "123456";
@@ -210,7 +209,7 @@
{
X = Application.GetRealWidth(28),
Y = Application.GetRealHeight(177),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(40),
TextID = StringId.LoginByPhone,
TextColor = CSS_Color.MainColor,
@@ -221,9 +220,9 @@
btnEmailLogin = new Button()
{
- X = btnPhoneLogin.Right + Application.GetRealWidth(20),
+ X = btnPhoneLogin.Right ,//+ Application.GetRealWidth(20),
Y = Application.GetRealHeight(177),
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(140),
Height = Application.GetRealHeight(40),
TextID = StringId.LoginByEmail,
TextColor = CSS_Color.PromptingColor1,
@@ -527,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()
{
--
Gitblit v1.8.0