From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index b1ebc13..bcba6a6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -213,12 +213,11 @@
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
//etAccount.Text = "13226233133";//璞嗚眴
- etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
- etAccount.Text = "18244942707";
etAccount.Text = "tf@smarttech.com.ua";
- etAccount.Text = "15871702179";
+ etAccount.Text = "455740454@qq.com";
+ etAccount.Text = "18688565449";
}
else
{
@@ -251,10 +250,10 @@
//etAccount.Text = "s.savinov@hdlautomation.ru";
}
b = !b;
- etPassword.Text = "qunhui105113";
- if(etAccount.Text == "13418062953")
+ etPassword.Text = "123456";
+ if(etAccount.Text == "18688565449")
{
- etPassword.Text = "a123456";
+ etPassword.Text = "CISQSMJH";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -754,6 +753,25 @@
},
};
curtain2.SaveFunctionFile();
+
+
+ var curtain3 = new Function()
+ {
+ sid = "curtain3",
+ deviceId = "curtain3",
+ name = Language.CurrentLanguage == "Chinese" ? "鐧惧彾甯�" : "Curtain 3",
+ spk = SPK.CurtainRoller,
+ roomIds = new List<string>() { "1405771024583090178" },
+ collect = true,
+ 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 = "angle",curValue= "0",state = "0" },
+ },
+ };
+ curtain3.SaveFunctionFile();
+
var fh = new Function()
{
sid = "floorheat1",
@@ -774,6 +792,40 @@
#if DEBUG
+ var mechanicalArm = new Function()
+ {
+ sid = "mechanicalArm1",
+ deviceId = "mechanicalArm1",
+ name = Language.CurrentLanguage == "Chinese" ? "鏈烘鎵�" : "Mechanical Arm",
+ spk = SPK.MechanicalArm,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ mechanicalArm.SaveFunctionFile();
+
+
+ var lightRgbw1 = new Function()
+ {
+ sid = "light11",
+ deviceId = "light11",
+ name = Language.CurrentLanguage == "Chinese" ? "瀹㈠巺姘涘洿鐏�12" : "RGB light 21",
+ spk = SPK.LightRGBW,
+ roomIds = new List<string>() { "1405771024583090178" },
+ 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 = "rgbw",value =new List<string>(){ "0","100" }, curValue="0,0,0,0",state = "0,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" },
+ },
+ };
+ FunctionList.List.Functions.Add(lightRgbw1);
+
FunctionList.List.Functions.Add(new Function
{
name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
@@ -805,11 +857,11 @@
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"},
+ //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"},
}
});
--
Gitblit v1.8.0