From de53d12e223eb8c9a562aeefdcfa9b4039b3d0b0 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 六月 2021 10:24:18 +0800
Subject: [PATCH] dome - 1
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index ac7893c..e02c0d0 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -1,7 +1,9 @@
锘縰sing System;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -165,8 +167,6 @@
/// </summary>
public void LoadView(UserInfo userInfo = null)
{
- Language.CurrentLanguage = "Chinese";
-
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -188,16 +188,65 @@
bodyView.AddChidren(btnIcon_bg);
#if DEBUG
+ btnIcon_bg.MouseUpEventHandler += (sender, e) =>
+ {
+ MainPage.NoLoginMode = true;
+ //妤煎眰鎴块棿鍒楄〃
+ var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
+ floor1.SaveRoomFile();
+ //澶勭悊鎴块棿鍒楄〃
+ var room1 = new Room() {
+ roomId = "r1",
+ roomName = "瀹㈠巺",
+ parentId = "f1"
+ };
+ room1.SaveRoomFile();
+ //鍔熻兘
+ var light1 = new Function()
+ {
+ sid = "light1",
+ deviceId = "light1",
+ name = "RGB1",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
+ },
+ };
+ light1.SaveFunctionFile();
+ //鍦烘櫙
+ };
+
bool b = false;
btnIcon.MouseUpEventHandler += (sender, e) =>
{
+ //ESOnVideo.Current.Test(false);
+
+ //return;
if (b)
{
- etAccount.Text = "18824864143";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ etAccount.Text = "15626203746";//娴嬭瘯鏈嶅姟鍣�
+ //etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
+ //etAccount.Text = "1033326940@qq.com";
+ //etAccount.Text = "18022428438";//wjc
+ //etAccount.Text = "13602944661";//kx
+ //etAccount.Text = "13226233133";//璞嗚眴
+ //etAccount.Text = "18316672920";//lcg "18316672920";//hzx;// "13415629083"//cf;;
+ //etAccount.Text = "18316120654";//tujie
+ // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
}
else
{
- etAccount.Text = "13375012446";//13375012446
+ //etAccount.Text = "15217626103";//
+ //etAccount.Text = "13682244600";//娉㈠摜
+ //etAccount.Text = "BB01010101@evoyo.com";//鍙瀵硅
+ //etAccount.Text = "13168123446";
+ //etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
+ //etAccount.Text = "13602944661";//kx
+ etAccount.Text = "551775569@qq.com";//wcf
+ //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
+ //etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
}
b = !b;
etPassword.Text = "123456";
@@ -210,7 +259,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 +270,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,
@@ -476,7 +525,7 @@
LoadEventList();
account = etAccount.Text.Trim();
-#if DEBUG1211
+ #if DEBUG1211
//鏈湴妯″紡
Button btnLocalMode = new Button()
{
@@ -498,7 +547,7 @@
MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
-#endif
+ #endif
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
@@ -527,9 +576,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