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 | 92 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5a5e2fc..0157bb3 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -213,6 +213,7 @@
//etAccount.Text = "18316120654";//tujie
// "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
etAccount.Text = "15626203746";
+ //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
}
else
{
@@ -229,6 +230,7 @@
//etAccount.Text = "551775569@qq.com";//wcf
//etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
//etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
+ etAccount.Text = "15971583093";//楂樿儨 璋冨厜0 100 鍙嶅妯烦
}
b = !b;
etPassword.Text = "123456";
@@ -516,7 +518,7 @@
IsBold = true,
TextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
- Text = "Dome妯″紡"
+ Text = "Demo妯″紡"
};
bodyView.AddChidren(btnDomeLogin);
btnDomeLogin.MouseUpEventHandler = (sender, e) => {
@@ -616,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();
@@ -633,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();
@@ -650,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();
@@ -667,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();
@@ -682,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();
@@ -697,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();
@@ -711,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();
@@ -725,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();
@@ -897,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();
@@ -912,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();
@@ -1003,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();
@@ -1044,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