From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs
index 4eb1277..a46b9a4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacControlPage.cs
@@ -102,6 +102,7 @@
this.RefreshNowDeviceStatuMemory(this.device);
//鍒锋柊鐣岄潰鐘舵��
this.RefreshFormStatu();
+ controlTime = DateTime.Now;
//璇诲彇鐘舵��
new System.Threading.Thread(() =>
{
@@ -109,7 +110,7 @@
{
if (controlTime == DateTime.MinValue)
{
-
+
}
else if (controlTime.AddSeconds(2) < DateTime.Now)
{
@@ -129,7 +130,7 @@
{
var btnHumidityIcon = new Button()
{
- X = Application.GetRealWidth(55),
+ X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(101),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
@@ -138,7 +139,7 @@
FrameWhiteCentet1.AddChidren(btnHumidityIcon);
btnHumidityValues = new TextButton()
{
- X = Application.GetRealWidth(83),
+ X = Application.GetRealWidth(222),
Y = Application.GetRealHeight(96),
Height = Application.GetRealHeight(33),
Width = Application.GetRealWidth(100),
@@ -151,7 +152,7 @@
Button btnTempIcon = new Button()
{
- X = Application.GetRealWidth(194),
+ X = Application.GetRealWidth(55),
Y = Application.GetRealHeight(101),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
@@ -161,7 +162,7 @@
btnTempValues = new TextButton()
{
- X = Application.GetRealWidth(222),
+ X = Application.GetRealWidth(83),
Y = Application.GetRealHeight(96),
Height = Application.GetRealHeight(33),
Width = Application.GetRealWidth(100),
@@ -176,7 +177,6 @@
temp = (int)Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", "."));
if (temp <= 0)
{
- //榛樿鍊兼敼鎴�16,2022骞�06鏈�10鏃�10:03:19 鎴愮敨瑕佹眰鐨�
temp = 16;
device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
}
@@ -683,10 +683,12 @@
{
//btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C"
// + Language.StringByID(StringId.Humidity) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState("room_humidity").Replace(", ", "."))) + "%";
- btnTempValues.Text = Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
- btnHumidityValues.Text = Convert.ToInt32(Convert.ToDouble(device.GetAttrState("room_humidity").Replace(", ", "."))) + "%";
+ btnTempValues.Text = Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")) + "掳C";
+ btnHumidityValues.Text = Convert.ToDouble(device.GetAttrState("room_humidity").Replace(", ", ".")) + "%";
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
+ btnModeText.Text = acFunction.GetModeAttrText(device.GetAttrState(FunctionAttributeKey.Mode));
+
temp = Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")));
--
Gitblit v1.8.0