From 6e8dba90956d7068df68144aa4c6d1189e596255 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 17:17:03 +0800
Subject: [PATCH] 调光设备本地控制问题
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 58ce5a1..2103fe5 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -205,7 +205,7 @@
{
//etAccount.Text = "tf@smarttech.com.ua";//鍥藉璐﹀彿锛屾湁浣忓畢锛岀櫥褰曟棤娉曟樉绀�
//etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
- etAccount.Text = "13450425803";
+ //etAccount.Text = "13450425803";
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
@@ -223,15 +223,13 @@
//etAccount.Text = "15217626103";//
//etAccount.Text = "13682244600";//娉㈠摜
//etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
- etAccount.Text = "551775569@qq.com";
- etAccount.Text = "2949126848@qq.com";//闄堢惓cct娴嬭瘯
+ //etAccount.Text = "2949126848@qq.com";//闄堢惓
//etAccount.Text = "13168123446";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
//etAccount.Text = "13602944661";//kx
- //etAccount.Text = "551775569@qq.com";//wcf
+ 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 鍙嶅妯烦
+ //etAccount.Text = "15971583093";//楂樿儨
}
b = !b;
etPassword.Text = "123456";
@@ -671,12 +669,12 @@
sid = "light4",
deviceId = "light4",
name = Language.CurrentLanguage == "Chinese" ? "澶х伅" : "light 1",
- spk = SPK.LightSwitch,
+ spk = SPK.LightDimming,
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 = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -691,7 +689,6 @@
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" },
},
};
@@ -735,7 +732,7 @@
{
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 = "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" },
},
};
@@ -901,12 +898,12 @@
sid = "light6",
deviceId = "light6",
name = Language.CurrentLanguage == "Chinese" ? "椁愬巺鐏�1" : "Dining room light 1",
- spk = SPK.LightSwitch,
+ spk = SPK.LightDimming,
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 = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -921,7 +918,6 @@
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" },
},
};
@@ -1053,7 +1049,6 @@
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" },
},
};
@@ -1062,15 +1057,11 @@
#endregion
var fileList = Common.FileUtlis.Files.ReadFiles();
-
+ foreach(var file in fileList)
+ {
+ FunctionList.List.IniFunctionList(file,true);
+ }
Room.CurrentSpatial.InitRoomListFunctions();
-
-
-
-
-
-
-
--
Gitblit v1.8.0