From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
index c03afbb..fe9d187 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -274,8 +274,8 @@
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/ 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();
@@ -292,8 +292,13 @@
{
LoadEditDialog(() =>
{
- btnWorkHours.Text = hour + "鏃�";
- btnWorkHours.Text += minute + "鍒�";
+ if(hour == 0 && minute == 0 && second == 0)
+ {
+ new PublicAssmebly().TipMsg(StringId.Tip, StringId.TimeInvalid);
+ return;
+ }
+ //btnWorkHours.Text = hour + "鏃�";
+ btnWorkHours.Text = minute + "鍒�";
btnWorkHours.Text += second + "绉�";
new System.Threading.Thread(() => {
var d = new Dictionary<string, string>();
@@ -397,13 +402,13 @@
{
item1.Add(i+Language.StringByID(StringId.h));
}
- for (int i = 0; i <= 59; i += 1)
+ for (int i = 1; i <= 119; i += 1)
{
item2.Add(i + Language.StringByID(StringId.m));
item3.Add(i + Language.StringByID(StringId.s));
}
- uIPickerView.setNPicker(item1, item2,item3);
- uIPickerView.setCurrentItems(hour, minute, second);
+ uIPickerView.setNPicker( item3,null,null);
+ uIPickerView.setCurrentItems(second-1,0,0);
optionBaseView.AddChidren(uIPickerView);
dialog.Show();
--
Gitblit v1.8.0