From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 362 ++++++++++++++++++++++++++++-----------------------
1 files changed, 199 insertions(+), 163 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5418dd3..246f9f4 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -324,6 +324,8 @@
etAccount.Text = "support7@hdlautomation.com";
etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
etAccount.Text = "15855403939";
+ etAccount.Text = "15006564444";
+ etAccount.Text = "13580507523";
}
else
{
@@ -375,9 +377,9 @@
else if (etAccount.Text == "18100573477")
{
etPassword.Text = "huang12345";
- }else if(etAccount.Text == "13549566666")
+ }else if(etAccount.Text == "15006564444")
{
- etPassword.Text = "12345678";
+ etPassword.Text = "zht626800";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -770,8 +772,8 @@
#region 鍔熻兘
var lightRgb1 = new Function()
{
- sid = "light1",
- deviceId = "light1",
+ sid = "light10000000000",
+ deviceId = "light10000000000",
name = Language.CurrentLanguage == "Chinese"? "瀹㈠巺姘涘洿鐏�1": "RGB light 1",
spk = SPK.LightRGB,
roomIds = new List<string>() { "1405771024583090178"},
@@ -921,6 +923,69 @@
#if DEBUG
+
+
+ if (FunctionList.List.groupControls.Count == 0)
+ {
+ FunctionList.List.groupControls.Add(new GroupControl()
+ {
+ name = "缇ゆ帶娴嬭瘯",
+ collect = true,
+ uids = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ roomIds = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ sids = new List<GroupControlFunction>()
+ {
+ new GroupControlFunction(){
+ sid = "light1",
+ spk = SPK.LightRGB,
+ },
+ new GroupControlFunction(){
+ sid = "light2",
+ spk = SPK.LightRGB,
+ },
+ }
+ });
+ }
+
+
+ var series1 = new Function()
+ {
+ sid = "light10000000000series1",
+ deviceId = "light10000000000series1",
+ name = Language.CurrentLanguage == "Chinese" ? "搴忓垪1" : "Series1",
+ spk = SPK.CommonSeries,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ series1.SaveFunctionFile();
+
+
+ var series2 = new Function()
+ {
+ sid = "light10000000000series2",
+ deviceId = "light10000000000series2",
+ name = Language.CurrentLanguage == "Chinese" ? "搴忓垪2" : "Series2",
+ spk = SPK.CommonSeries,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ series2.SaveFunctionFile();
+
+
var mechanicalArm = new Function()
{
sid = "mechanicalArm1",
@@ -955,142 +1020,142 @@
};
FunctionList.List.Functions.Add(lightRgbw1);
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
- // spk = SPK.AcstParent,
- // collect = true,
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
- // value = new List<string>
- // {
- // AcstParent_Attr_ModeValueEnum.cool.ToString(),
- // AcstParent_Attr_ModeValueEnum.dry.ToString(),
- // AcstParent_Attr_ModeValueEnum.fan.ToString(),
- // AcstParent_Attr_ModeValueEnum.heat.ToString(),
- // AcstParent_Attr_ModeValueEnum.humidity.ToString(),
- // AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
- // }
- // },
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
- // value = new List<string>()
- // {
- // AcstParent_Attr_SceneValueEnum.at_home.ToString(),
- // AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
- // AcstParent_Attr_SceneValueEnum.sleep.ToString(),
- // }
- // },
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
- // 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"},
- //}
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
+ spk = SPK.AcstParent,
+ collect = true,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ value = new List<string>
+ {
+ AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ AcstParent_Attr_ModeValueEnum.dry.ToString(),
+ AcstParent_Attr_ModeValueEnum.fan.ToString(),
+ AcstParent_Attr_ModeValueEnum.heat.ToString(),
+ AcstParent_Attr_ModeValueEnum.humidity.ToString(),
+ AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
+ }
+ },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ value = new List<string>()
+ {
+ AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
+ AcstParent_Attr_SceneValueEnum.sleep.ToString(),
+ }
+ },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
+ 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"},
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
- // spk = SPK.AcstSub,
- // sid = "0000001",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
- // spk = SPK.AcstSub,
- // sid = "0000002",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
- // spk = SPK.AcstSub,
- // sid = "0000003",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
- // spk = SPK.AcstSub,
- // sid = "0000004",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
- // spk = SPK.AcstSub,
- // sid = "0000005",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ spk = SPK.AcstSub,
+ sid = "0000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ spk = SPK.AcstSub,
+ sid = "0000002",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ spk = SPK.AcstSub,
+ sid = "0000003",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ spk = SPK.AcstSub,
+ sid = "0000004",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ spk = SPK.AcstSub,
+ sid = "0000005",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯姊﹀够绐楀笜",
- // spk = SPK.CurtainDream,
- // sid = "1234577",
- // attributes = new List<FunctionAttributes> {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
- // }
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姊﹀够绐楀笜",
+ spk = SPK.CurtainDream,
+ sid = "1234577",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯姣背娉紶鎰熷櫒",
- // spk = SPK.SenesorMegahealth,
- // attributes = new List<FunctionAttributes>
- // {
- // 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 = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // }
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姣背娉紶鎰熷櫒",
+ spk = SPK.SenesorMegahealth,
+ attributes = new List<FunctionAttributes>
+ {
+ 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 = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ }
+ });
FunctionList.List.Functions.Add(new Function
{
name = "娴嬭瘯娓╂帶鍣�",
@@ -1344,35 +1409,6 @@
#endregion
- if (FunctionList.List.groupControls.Count == 0)
- {
- FunctionList.List.groupControls.Add(new GroupControl()
- {
- name = "缇ゆ帶娴嬭瘯",
- collect = true,
- uids = new List<string>()
- {
- "1405771024583090178",
- "9191a3a2-026f-4667-a0b1-e3af699e7295",
- },
- roomIds = new List<string>()
- {
- "1405771024583090178",
- "9191a3a2-026f-4667-a0b1-e3af699e7295",
- },
- sids = new List<GroupControlFunction>()
- {
- new GroupControlFunction(){
- sid = "light1",
- spk = SPK.LightRGB,
- },
- new GroupControlFunction(){
- sid = "light2",
- spk = SPK.LightRGB,
- },
- }
- });
- }
#region 鍦烘櫙
var scene1 = new Scene()
{
--
Gitblit v1.8.0