From 068c68295cad1967f7aafb4e5e951260ef03d4ce Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 09:16:43 +0800
Subject: [PATCH] 状态属性更改，不要轻易合并
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 8d3d3da..0157bb3 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -618,11 +618,11 @@
collect = true,
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
- new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state="on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "100" },
+ new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, state = "0,0,0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightRgb1.SaveFunctionFile();
@@ -635,11 +635,11 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, state = "0,0,0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightRgb2.SaveFunctionFile();
@@ -652,11 +652,11 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "cct",value =new List<string>(){ "0","65535" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "cct",value =new List<string>(){ "0","65535" }, state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightCct.SaveFunctionFile();
@@ -669,9 +669,9 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightSwitch1.SaveFunctionFile();
@@ -684,9 +684,9 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightSwitch2.SaveFunctionFile();
@@ -699,8 +699,8 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "percent",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "percent",value =new List<string>(){ "0","100" }, state = "0" },
},
};
curtain1.SaveFunctionFile();
@@ -713,8 +713,8 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "percent",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "percent",value =new List<string>(){ "0","100" }, state = "0" },
},
};
curtain2.SaveFunctionFile();
@@ -727,10 +727,10 @@
roomIds = new List<string>() { "1405771024583090178"},
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- 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" },
- new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, state = "day" },
+ new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, state = "26" ,max = 30,min =16 },
+ new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, state = "26" },
},
};
fh.SaveFunctionFile();
@@ -899,9 +899,9 @@
roomIds = new List<string>() { room3.roomId },
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightSwitch3.SaveFunctionFile();
@@ -914,9 +914,9 @@
roomIds = new List<string>() { room3.roomId },
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightSwitch4.SaveFunctionFile();
@@ -1005,12 +1005,12 @@
roomIds = new List<string>() { room3.roomId },
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
- new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
- new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
- new FunctionAttributes() { key = "set_temp", 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 = "on_off", value = new List<string>() { "on", "off" }, state = "on" },
+ new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, state = "cool" },
+ new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, state = "auto" },
+ new FunctionAttributes() { key = "set_temp", value = new List<string>() { "16", "30"}, state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, state = "20" },
+ new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, state = "20" },
}
};
ac.SaveFunctionFile();
@@ -1046,9 +1046,9 @@
roomIds = new List<string>() { room1.roomId },
attributes = new List<FunctionAttributes>()
{
- new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, state = "on" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, state = "0" },
},
};
lightSwitch6.SaveFunctionFile();
--
Gitblit v1.8.0