From 8abfe81329d73836f40e6af40915e914a784f664 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 06 五月 2022 21:49:32 +0800 Subject: [PATCH] 紧急面板功能 --- HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 192 +++++++++++++++++++++++++++++++----------------- 1 files changed, 124 insertions(+), 68 deletions(-) diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs index 90bf91a..b6c3677 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs +++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs @@ -567,65 +567,102 @@ #if DEBUG - //FunctionList.List.Functions.Add(new Function - //{ - // name = "闂ㄩ攣", - // spk = SPK.DoorLock, - // sid = "12345", - // attributes = new List<FunctionAttributes> { - // new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" }, - // new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" }, - // new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" }, - // new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" }, - // new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" }, - // new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" }, - // new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" }, - // new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" }, - // new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" }, - // } - //}); - //FunctionList.List.Functions.Add(new Function - //{ - // name = "闂ㄩ攣1", - // spk = SPK.DoorLock, - // sid = "123", - // attributes = new List<FunctionAttributes> { - // new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" }, - // new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" }, - // new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" }, - // new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" }, - // new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" }, - // new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" }, - // new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" }, - // new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" }, - // new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" }, - // } - //}); + FunctionList.List.Functions.Add(new Function + { + name = "娴嬭瘯闂ㄩ攣", + spk = SPK.DoorLock, + sid = "12345", + attributes = new List<FunctionAttributes> { + new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" }, + new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" }, + new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" }, + new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" }, + new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" }, + new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" }, + new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" }, + new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" }, + new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" }, + } + }); + FunctionList.List.Functions.Add(new Function + { + name = "闂ㄩ攣1", + spk = SPK.DoorLock, + sid = "123", + attributes = new List<FunctionAttributes> { + new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" }, + new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" }, + new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" }, + new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" }, + new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" }, + new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" }, + new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" }, + new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" }, + new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" }, + } + }); - //FunctionList.List.Functions.Add(new Function() - //{ - // spk = SPK.PanelSocket, - // name = "闈㈡澘鎻掑骇", - // attributes = new List<FunctionAttributes> - // { - // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, - // new FunctionAttributes(){ key = "on_off_usb",curValue= "on",state = "on" }, - // new FunctionAttributes(){ key = "active_power",curValue= "220",state = "220" }, - // new FunctionAttributes(){ key = "voltage",curValue= "5",state = "5" }, - // new FunctionAttributes(){ key = "current",curValue= "110",state = "110" }, - // new FunctionAttributes(){ key = "total_electricity",curValue= "123.33",state = "123.33" }, - // } - //}); + FunctionList.List.Functions.Add(new Function() + { + spk = SPK.PanelSocket, + name = "闈㈡澘鎻掑骇", + attributes = new List<FunctionAttributes> + { + new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, + new FunctionAttributes(){ key = "on_off_usb",curValue= "on",state = "on" }, + new FunctionAttributes(){ key = "active_power",curValue= "220",state = "220" }, + new FunctionAttributes(){ key = "voltage",curValue= "5",state = "5" }, + new FunctionAttributes(){ key = "current",curValue= "110",state = "110" }, + new FunctionAttributes(){ key = "total_electricity",curValue= "123.33",state = "123.33" }, + } + }); - //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 = "骞叉帴鐐�", + attributes = new List<FunctionAttributes>() + { + new FunctionAttributes(){ key = "status",curValue= "on",state = "on" }, + }, + }); + + FunctionList.List.Functions.Add(new Function() + { + spk = SPK.SensorPm25, + name = "娴嬭瘯Pm2.5", + attributes = new List<FunctionAttributes>() + { + new FunctionAttributes(){ key = "pm25",curValue= "70",state = "70" }, + }, + attrKeyConfigs = new List<AttrKeyConfig>() + { + new AttrKeyConfig (){ + key = "pm2.5", + type = "interval" , + 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 = "杞�/涓害姹℃煋"}, + new AttrKeyInfo(){ start = "151",end = "500",color = 0xFFFF9D54,desc = "閲嶅害/涓ラ噸姹℃煋"}, + } + } + }, + }); + + 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() //{ @@ -637,22 +674,34 @@ // }, //}); - //FunctionList.List.Functions.Add(new Function() - //{ - // spk = SPK.AirFreshStandard, - // name = "娴嬭瘯鏂伴", - // attributes = new List<FunctionAttributes>() - // { - // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, - // new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } }, - // }, - //}); + FunctionList.List.Functions.Add(new Function() + { + spk = SPK.AirFreshStandard, + name = "娴嬭瘯鏂伴", + sid = "098765433242342342", + attributes = new List<FunctionAttributes>() + { + new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, + new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } }, + }, + }); + + FunctionList.List.Functions.Add(new Function() + { + spk = SPK.PanelEnvironment, + name = "娴嬭瘯鐜闈㈡澘", + targetSids = new List<string> { + "098765433242342342", + "ac1", + "floorheat1" + } + }); FunctionList.List.Functions.Add(new Function() { spk = SPK.HvacCac, - name = "娴嬭瘯閲戣寕娓╂帶鏋告潪", + name = "娴嬭瘯閲戣寕娓╂帶", attributes = new List<FunctionAttributes>() { new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, @@ -872,6 +921,7 @@ /// <summary> /// 鍔犺浇璁惧鍔熻兘鏄剧ず鍖哄煙 + /// Tag 鏀惰棌鍗$墖 /// </summary> void LoadDeviceFunctionControlZone() { @@ -1085,6 +1135,7 @@ /// <summary> /// 鍔犺浇鍔熻兘鎺у埗鍗$墖 + /// Tag 鍗$墖鑷畾涔� /// </summary> void LoadDeviceFunctionDiv(FrameLayout view, Function function) { @@ -1299,6 +1350,11 @@ LoadEvent_ControlClothesHanger(function, btnUp, btnDown); } + //绱ф�ユ眰鍔� + else if (function.spk == SPK.SensorHelp) + { + + } else { -- Gitblit v1.8.0