From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 95 +++++++++++++++--------------------------------
1 files changed, 30 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index de1cf2e..0e921fe 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -294,98 +294,62 @@
//return;
if (b)
{
- //etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
- //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 = "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 = "13418062953";
- etAccount.Text = "13138683659";
- //etAccount.Text = "15217626103";
- //etAccount.Text = "18100573477";
- //etAccount.Text = "18321091245";
- //etAccount.Text = "13751916353";
- etAccount.Text = "13549566666";
- etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
- etAccount.Text = "15855403939";
- etAccount.Text = "15006564444";
- etAccount.Text = "pjh@hdlchina.com.cn";
+ //etAccount.Text = "18688414428";//澶╂渤3妤�
+ //etAccount.Text = "pjh@hdlchina.com.cn";
//etAccount.Text = "12345678904";//2.0 娴嬭瘯 钀ょ煶
- etAccount.Text = "18316672920";
- etAccount.Text = "18244942707";
- etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
- etAccount.Text = "13533335801";
- etAccount.Text = "13682244600";
- etAccount.Text = "marketing@australindo.co.id";
- etAccount.Text = "support7@hdlautomation.com";
- etAccount.Text = "13922115008";//鍒樻��
- etAccount.Text = "1272061968@qq.com";
- etAccount.Text = "support7@hdlautomation.com";
- etAccount.Text = "info@hdlegypt.com";
+ //etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
+ //etAccount.Text = "marketing@australindo.co.id";
+ //etAccount.Text = "13922115008";//鍒樻��
+ //etAccount.Text = "support7@hdlautomation.com";
+ etAccount.Text = "13336018868";
+ etAccount.Text = "13435693712";
}
else
{
//etAccount.Text = "464027401@qq.com";//
- //etAccount.Text = "15217626103";//
- etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
+ //etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
//etAccount.Text = "2949126848@qq.com";//闄堢惓
- etAccount.Text = "15014291819 ";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
- //etAccount.Text = "13602944661";//kx
- //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
//etAccount.Text = "15971583093";//楂樿儨
//etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
- //etAccount.Text = "18598273624";
- //etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
- //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
//etAccount.Text = "13430286286";//cwc
- //etAccount.Text = "13709260805";
//etAccount.Text = "support5@hdlchina.com.cn";
- //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 == "info@hdlegypt.com")
+ if(etAccount.Text == "13336018868")
{
- etPassword.Text = "@Hdl2020";
+ etPassword.Text = "zzy20020928";
}
- else if(etAccount.Text == "18600200915")
+ else if(etAccount.Text == "13435693712")
{
- etPassword.Text = "ZJtiaoshi";
+ etPassword.Text = "a123456";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
- }else if(etAccount.Text == "18688414428")
+ }else if(etAccount.Text == "15014291819")
{
- etPassword.Text = "HDL1985000";
- }else if (etAccount.Text == "15855403939")
+ etPassword.Text = "hdl123456";
+ }else if (etAccount.Text == "15262988048")
{
- etPassword.Text = "yyr123456";
+ etPassword.Text = "15262988048";
}
- else if (etAccount.Text == "18100573477")
+ else if (etAccount.Text == "649362315@qq.com")
{
- etPassword.Text = "huang12345";
+ etPassword.Text = "aa123456";
}else if(etAccount.Text == "dcai.assist@gmail.com")
{
etPassword.Text = "GraniteTileS57";
@@ -557,6 +521,7 @@
PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
SecureTextEntry = true,
TextAlignment = TextAlignment.CenterLeft,
+
};
passwordView.AddChidren(etPassword);
@@ -1113,17 +1078,17 @@
new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
}
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ name = "瀛愭帶-1",
spk = SPK.AcstSub,
sid = "0000001",
attributes = new List<FunctionAttributes>()
@@ -1136,7 +1101,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ name = "瀛愭帶-2",
spk = SPK.AcstSub,
sid = "0000002",
attributes = new List<FunctionAttributes>()
@@ -1149,7 +1114,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ name = "瀛愭帶-3",
spk = SPK.AcstSub,
sid = "0000003",
attributes = new List<FunctionAttributes>()
@@ -1162,7 +1127,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ name = "瀛愭帶-4",
spk = SPK.AcstSub,
sid = "0000004",
attributes = new List<FunctionAttributes>()
@@ -1175,7 +1140,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ name = "瀛愭帶-5",
spk = SPK.AcstSub,
sid = "0000005",
attributes = new List<FunctionAttributes>()
--
Gitblit v1.8.0