From b25bf5d046a6557bb2db50f522b4a3bc4b5c2cbb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 30 六月 2023 17:57:18 +0800
Subject: [PATCH] 萤石sdk dll更新
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 68 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a109e0c..5418dd3 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -323,6 +323,7 @@
etAccount.Text = "18316672920";
etAccount.Text = "support7@hdlautomation.com";
etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
+ etAccount.Text = "15855403939";
}
else
{
@@ -367,9 +368,9 @@
}else if(etAccount.Text == "18688414428")
{
etPassword.Text = "HDL1985000";
- }else if (etAccount.Text == "13138683659")
+ }else if (etAccount.Text == "15855403939")
{
- etPassword.Text = "wsad123321";
+ etPassword.Text = "yyr123456";
}
else if (etAccount.Text == "18100573477")
{
@@ -780,8 +781,12 @@
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 = "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 = "colorful",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = FunctionAttributeKey.ColorfulBegin,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
+ new FunctionAttributes() { key = FunctionAttributeKey.ColorfulEnd,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
+ new FunctionAttributes() { key = FunctionAttributeKey.ColorfulTime,value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
lightRgb1.SaveFunctionFile();
@@ -1337,8 +1342,38 @@
#endif
-#endregion
-#region 鍦烘櫙
+ #endregion
+
+ if (FunctionList.List.groupControls.Count == 0)
+ {
+ FunctionList.List.groupControls.Add(new GroupControl()
+ {
+ name = "缇ゆ帶娴嬭瘯",
+ collect = true,
+ uids = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ roomIds = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ sids = new List<GroupControlFunction>()
+ {
+ new GroupControlFunction(){
+ sid = "light1",
+ spk = SPK.LightRGB,
+ },
+ new GroupControlFunction(){
+ sid = "light2",
+ spk = SPK.LightRGB,
+ },
+ }
+ });
+ }
+ #region 鍦烘櫙
var scene1 = new Scene()
{
sid = "scene1",
@@ -1695,29 +1730,6 @@
LoadEventList();
account = etAccount.Text.Trim();
-#if DEBUG1211
- //鏈湴妯″紡
- Button btnLocalMode = new Button()
- {
- Y = Application.GetRealHeight(600),
- Height = Application.GetRealHeight(67),
- Text = "Local Mode",
- TextAlignment = TextAlignment.Center,
- BackgroundColor = CSS_Color.MainColor,
- TextColor = CSS_Color.TextualColor,
- };
- bodyView.AddChidren(btnLocalMode);
-
- btnLocalMode.MouseUpEventHandler = (sender, e) =>
- {
- MainPage.LocalMode = true;
- UserInfo.Current = new UserInfo();
- MainPage.GoUserPage();
- };
-
- MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
-
-#endif
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
--
Gitblit v1.8.0