From e74a8d9e9dc5ef2120fd811fb03a870efb96a92a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:54:23 +0800
Subject: [PATCH] 2.3图标内容
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 127 ++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a62f728..1198236 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -327,8 +327,9 @@
etAccount.Text = "18316672920";
etAccount.Text = "18244942707";
etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
- etAccount.Text = "18933160333";
- etAccount.Text = "18402017839";//wjc
+ etAccount.Text = "13533335801";
+ etAccount.Text = "13682244600";
+ etAccount.Text = "marketing@australindo.co.id";
}
else
@@ -364,9 +365,9 @@
{
etPassword.Text = "hdl123";
}
- else if(etAccount.Text == "13143792049")
+ else if(etAccount.Text == "18600200915")
{
- etPassword.Text = "BVVBQATD";
+ etPassword.Text = "ZJtiaoshi";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
@@ -380,9 +381,9 @@
else if (etAccount.Text == "18100573477")
{
etPassword.Text = "huang12345";
- }else if(etAccount.Text == "1272061968@qq.com")
+ }else if(etAccount.Text == "marketing@australindo.co.id")
{
- etPassword.Text = "a123456";
+ etPassword.Text = "HDLAGN2023";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -947,7 +948,7 @@
{
sid = "airSwitchP3000000000001",
deviceId = "airSwitchP3000000000001",
- name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
+ name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
spk = SPK.AirSwitchP3,
roomIds = new List<string>() { "1405771024583090178" },
attributes = new List<FunctionAttributes>()
@@ -973,7 +974,7 @@
new FunctionAttributes() { key = FunctionAttributeKey.ElectricityC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
new FunctionAttributes() { key = FunctionAttributeKey.TotalElectricity,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
},
- collect=true,
+ //collect = true,
};
airSwitchP3.SaveFunctionFile();
@@ -1077,7 +1078,7 @@
{
name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
spk = SPK.AcstParent,
- collect = true,
+ //collect = true,
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
@@ -1202,7 +1203,7 @@
new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
- new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ new FunctionAttributes(){ key = "target_status",curValue = "1",state = "1" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
@@ -1279,15 +1280,57 @@
// }
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorDryContact,
- // name = "骞叉帴鐐�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorDryContact,
+ name = "骞叉帴鐐�",
+ //collect = true,
+ sid = "sss000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "contact_status",curValue= "open",state = "open" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.OtherCommon,
+ name = "閫氱敤寮�鍏�",
+ //collect = true,
+ sid = "sssCommon000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "off" },
+ },
+ });
+
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPir,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�1",
+ collect = true,
+ sid = "sss000001111",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "false",state = "false" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPirHold,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�2",
+ collect = true,
+ sid = "sss0000011112",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "true",state = "true" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1312,19 +1355,19 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorHelp,
- // name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorHelp,
+ name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1366,16 +1409,16 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorGas,
- // name = "鐕冩皵浼犳劅鍣�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- // new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorGas,
+ name = "鐕冩皵浼犳劅鍣�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+ },
+ });
//FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
// attributes = new List<FunctionAttributes>() {
--
Gitblit v1.8.0