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/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index b2766cd..be06592 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -170,10 +170,11 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 50,
IsBold = true,
- Text = Convert.ToDouble(temp).ToString(),
+ Text = "111",
TextAlignment = TextAlignment.Center,
};
btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+ btnTemp.Text = Convert.ToDouble(temp).ToString();
FrameWhiteCentet1.AddChidren(btnTemp);
@@ -914,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());
@@ -944,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());
@@ -959,7 +960,7 @@
device.SetAttrState(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
btnTemp.Text = arcBar.Progress.ToString();
controlTime = DateTime.Now;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
Control.Ins.SendWriteCommand(device, d);
};
@@ -967,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");
@@ -1075,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