From e7290281eabcb88d2e430dea9782565474837ce1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 20 十月 2023 14:29:54 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
index fe9d187..ea2dd01 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -292,18 +292,18 @@
{
LoadEditDialog(() =>
{
- if(hour == 0 && minute == 0 && second == 0)
+ if( second == 0)
{
new PublicAssmebly().TipMsg(StringId.Tip, StringId.TimeInvalid);
return;
}
//btnWorkHours.Text = hour + "鏃�";
- btnWorkHours.Text = minute + "鍒�";
- btnWorkHours.Text += second + "绉�";
+ btnWorkHours.Text = second/60 + "鍒�";
+ btnWorkHours.Text += second%60 + "绉�";
new System.Threading.Thread(() => {
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());
+ function.SetAttrState(FunctionAttributeKey.ColorfulTime, ( minute * 60 + second).ToString());
+ d.Add(FunctionAttributeKey.ColorfulTime, ( minute * 60 + second).ToString());
Control.Ins.SendWriteCommand(function, d);
}) { IsBackground = true }.Start();
});
@@ -402,7 +402,7 @@
{
item1.Add(i+Language.StringByID(StringId.h));
}
- for (int i = 1; i <= 119; i += 1)
+ for (int i = 1; i <= 120; i += 1)
{
item2.Add(i + Language.StringByID(StringId.m));
item3.Add(i + Language.StringByID(StringId.s));
@@ -421,9 +421,7 @@
dialog.Close();
};
uIPickerView.OnSelectChangeEvent = (int1, int2, int3) => {
- hour = int1;
- minute = int2;
- second = int3;
+ second = int1+1;
};
btnConfrim.MouseUpEventHandler = (sender, e) => {
dialog.Close();
--
Gitblit v1.8.0