From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 100 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 9288a97..280000b 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,6 +22,13 @@
Application.HideSoftInput();
};
pm = new HttpServerRequest();
+
+ BaseActivity.HideKeyboardEvent = () => {
+ Application.RunOnMainThread(() =>
+ {
+ this.Y = 0;
+ });
+ };
}
public override void RemoveFromParent()
@@ -33,9 +40,14 @@
waitPage = null;
}
+
+ BaseActivity.HideKeyboardEvent = () => {
+
+ };
+
base.RemoveFromParent();
- ////2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
//Application.HideSoftInput();
}
@@ -190,6 +202,9 @@
UnSelectedImagePath = "Public/Logo-bg.png"
};
bodyView.AddChidren(btnIcon_bg);
+ btnIcon_bg.MouseDownEventHandler += (sender, e) => {
+ Application.HideSoftInput();
+ };
#if DEBUG
btnIcon_bg.MouseUpEventHandler += (sender, e) =>
@@ -215,19 +230,33 @@
//etAccount.Text = "13226233133";//璞嗚眴
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
- etAccount.Text = "tf@smarttech.com.ua";
- etAccount.Text = "455740454@qq.com";
- etAccount.Text = "18688565449";
+ //etAccount.Text = "tf@smarttech.com.ua";
+ //etAccount.Text = "455740454@qq.com";
+ //etAccount.Text = "18688565449";
etAccount.Text = "support7@hdlautomation.com";
- etAccount.Text = "13288623489";
- etAccount.Text = "18570064522";
+ //etAccount.Text = "18570064522";
+ //etAccount.Text = "18718417827";
+ //etAccount.Text = "18188019284";
+ //etAccount.Text = "13143792049";
+ //etAccount.Text = "13288623489";//缃楁檽涓�
+ //etAccount.Text = "18244942707";
+ //etAccount.Text = "13143792049";
+ etAccount.Text = "18688414428";//澶╂渤3妤�
+ //etAccount.Text = "18244942707";
+ //etAccount.Text = "12345678904";
+ //etAccount.Text = "13418062953";
+ etAccount.Text = "13138683659";
+ //etAccount.Text = "15217626103";
+ //etAccount.Text = "18100573477";
+ //etAccount.Text = "18321091245";
+ //etAccount.Text = "13751916353";
+ etAccount.Text = "13549566666";
+ etAccount.Text = "18316672920";
}
else
{
- //etAccount.Text = "15018447586";//闊充箰鏁伴噺鍒锋柊闂
//etAccount.Text = "464027401@qq.com";//
//etAccount.Text = "15217626103";//
- //etAccount.Text = "13682244600";//娉㈠摜
etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
//etAccount.Text = "2949126848@qq.com";//闄堢惓
etAccount.Text = "15014291819 ";
@@ -248,19 +277,35 @@
//etAccount.Text = "info@smartlife-ks.com";
//etAccount.Text = "551775569@qq.com";//wcf
etAccount.Text = "15626203746";
- //etAccount.Text = "18244942707";
//etAccount.Text = "zhangquansongjava@163.com";
//etAccount.Text = "s.savinov@hdlautomation.ru";
+
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "13288623489")
+ if(etAccount.Text == "18188019284")
+ {
+ etPassword.Text = "CEZUJHSZ";
+ }
+ else if(etAccount.Text == "13143792049")
+ {
+ etPassword.Text = "BVVBQATD";
+ }else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
- }
- else if(etAccount.Text == "18570064522")
+ }else if(etAccount.Text == "18688414428")
{
- etPassword.Text = "BWMSRYWN";
+ etPassword.Text = "HDL1985000";
+ }else if (etAccount.Text == "13138683659")
+ {
+ etPassword.Text = "wsad123321";
+ }
+ else if (etAccount.Text == "18100573477")
+ {
+ etPassword.Text = "huang12345";
+ }else if(etAccount.Text == "13549566666")
+ {
+ etPassword.Text = "12345678";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -289,7 +334,7 @@
Height = Application.GetRealHeight(40),
TextID = StringId.LoginByEmail,
TextColor = CSS_Color.PromptingColor1,
- TextAlignment = TextAlignment.Center,
+ TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize,
};
bodyView.AddChidren(btnEmailLogin);
@@ -1062,7 +1107,7 @@
// new AttrKeyConfig (){
// key = "pm2.5",
// type = "interval" ,
- // unit = "ug/m虏",
+ // unit = "ug/m鲁",
// configs = new List<AttrKeyInfo>(){
// new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"},
// new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"},
@@ -1493,12 +1538,33 @@
new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
- new FunctionAttributes() { key = "set_temp", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = "set_temp",step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
}
};
ac.SaveFunctionFile();
+
+ var ac2 = new Function()
+ {
+ sid = "ac2",
+ deviceId = "ac2",
+ name = Language.CurrentLanguage == "Chinese" ? "瀹㈠巺绌鸿皟" : "AC",
+ spk = SPK.AcStandard,
+ roomIds = new List<string>() { room4.roomId },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
+ new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
+ new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
+ new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
+ new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
+ }
+ };
+ ac2.SaveFunctionFile();
+
+
//var scene5 = new Scene()
//{
// sid = "scene5",
@@ -1519,7 +1585,7 @@
// collect = false,
//};
//scene6.SaveSceneFile();
-#endregion
+ #endregion
var lightSwitch6 = new Function()
--
Gitblit v1.8.0