From 0131f1fdda0189508264f540d600b46f40411d30 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 六月 2023 15:57:25 +0800
Subject: [PATCH] 场景温度单位更新
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 210 ++++++++++++++++++++++++++--------------------------
1 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index c5bdf9f..0eda5db 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -900,7 +900,7 @@
new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" },
new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 },
new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
- new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" },
},
};
fh.SaveFunctionFile();
@@ -942,110 +942,110 @@
};
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"},
+ //}
+ //});
@@ -1624,7 +1624,7 @@
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" },
- new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" },
}
};
ac2.SaveFunctionFile();
--
Gitblit v1.8.0