From eeb6f0b4bf0a81834325638401d5fa404e53db93 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 05 九月 2024 19:41:45 +0800
Subject: [PATCH] 金茂光伏储能，热水器；自动化，空调，地暖步进判断
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index ed0ce44..9bb5331 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -6,7 +6,6 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
-using Security;
using Shared;
namespace HDL_ON.UI.UI1Login
@@ -316,9 +315,10 @@
//etAccount.Text = "13922115008";//鍒樻��
//etAccount.Text = "support7@hdlautomation.com";
etAccount.Text = "13336018868";
- etAccount.Text = "649362315@qq.com";
+ etAccount.Text = "649362315@qq.com";//钄℃窇濞�
//etAccount.Text = "18402017839";
- etAccount.Text = "18620993214";
+ //etAccount.Text = "18620993214";
+ //etAccount.Text = "13414984501";//鍚存檽鑱�
}
else
@@ -342,7 +342,7 @@
{
etPassword.Text = "hdl1985.";
}
- else if (etAccount.Text == "13580507523")
+ else if (etAccount.Text == "13414984501")
{
etPassword.Text = "a123456";
}
@@ -1177,20 +1177,7 @@
new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
}
});
- FunctionList.List.Functions.Add(new Function
- {
- name = "瀛愭帶-5",
- spk = SPK.AcstSub,
- sid = "0000005",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- }
- });
-
+
FunctionList.List.Functions.Add(new Function
{
name = "瀛愭帶-5",
@@ -1218,11 +1205,11 @@
new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.flow.ToString(),curValue = "2",state = "2" },
new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode.ToString(),curValue = "economic",state = "economic" },
new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode_free.ToString(),curValue = "true",state = "true" },
- new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.recycl_volume.ToString(),curValue = "5",state = "5" },
+ new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.recycl_volume.ToString(),curValue = "10",state = "10" },
new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.set_temp.ToString(),curValue = "25",state = "25" },
new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.temp.ToString(),curValue = "23",state = "23" },
new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.trees.ToString(),curValue = "8",state = "8" },
- new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.volume.ToString(),curValue = "88",state = "88" },
+ new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.volume.ToString(),curValue = "100",state = "100" },
},
});
--
Gitblit v1.8.0