From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index c509f05..be06592 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -170,7 +170,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 50,
IsBold = true,
- Text = "28",
+ Text = "111",
TextAlignment = TextAlignment.Center,
};
btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
@@ -915,8 +915,8 @@
controlTime = DateTime.Now;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
- btnTempUint.X = btnTemp.Right;
+ //btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+ //btnTempUint.X = btnTemp.Right;
device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -945,8 +945,8 @@
controlTime = DateTime.Now;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
- btnTempUint.X = btnTemp.Right;
+ //btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+ //btnTempUint.X = btnTemp.Right;
device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -968,8 +968,8 @@
{
device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
btnTemp.Text = e.ToString();
- btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
- btnTempUint.X = btnTemp.Right;
+ //btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+ //btnTempUint.X = btnTemp.Right;
};
//arcBar.MouseDownEventHandler = (sender, e) => {
// Console.WriteLine("ddd");
@@ -1076,8 +1076,8 @@
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
- btnTempUint.X = btnTemp.Right;
+ //btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+ //btnTempUint.X = btnTemp.Right;
if (device.trait_on_off.curValue.ToString() == "on")
{
--
Gitblit v1.8.0