From a59663c4981c498f007307f7115f6850ab73e239 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 七月 2023 21:06:51 +0800
Subject: [PATCH] 群控界面修复 1.9版本bug修复
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
index 86ce901..c5cee61 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -61,7 +61,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.ColorfulSwitch,
+ TextID = StringId.CulorfulTest,
};
viewSwitch.AddChidren(btnSwitchText);
@@ -271,6 +271,13 @@
};
workHoursView.AddChidren(btnWorkHours);
+ var time = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.ColorfulTime));
+
+
+ btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h);
+ btnWorkHours.Text += time / 60 + Language.StringByID(StringId.m);
+ btnWorkHours.Text += time % 60 + Language.StringByID(StringId.s);
+
var waitPage = new Loading();
this.AddChidren(waitPage);
@@ -289,7 +296,8 @@
btnWorkHours.Text += minute + "鍒�";
btnWorkHours.Text += second + "绉�";
new System.Threading.Thread(() => {
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ var d = new Dictionary<string, string>();
+ function.SetAttrState(FunctionAttributeKey.ColorfulTime, (hour * 360 + minute * 60 + second).ToString());
d.Add(FunctionAttributeKey.ColorfulTime, (hour * 360 + minute * 60 + second).ToString());
Control.Ins.SendWriteCommand(function, d);
}) { IsBackground = true }.Start();
@@ -309,8 +317,6 @@
btnWorkHours.MouseUpEventHandler = eventHandler;
workHoursView.MouseUpEventHandler = eventHandler;
btnWorkHoursRight.MouseUpEventHandler = eventHandler;
-
-
#endregion
--
Gitblit v1.8.0