From 762eed3a31840aa91ac508c63b8df54029cf0262 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 七月 2023 16:48:12 +0800
Subject: [PATCH] 炫彩功能优化
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
index 8b683de..63cd333 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -1,6 +1,7 @@
锘�
using System;
using System.Collections.Generic;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.Stan;
using HDL_ON.UI.CSS;
@@ -88,7 +89,7 @@
btnStartColor.BackgroundColor = color;
function.SetAttrState(FunctionAttributeKey.ColorfulBegin, color);
};
- var rgbView = new ColorfulSettingPage(action);
+ var rgbView = new ColorfulSettingPage(function, action,true);
MainPage.BasePageView.AddChidren(rgbView);
rgbView.LoadPage(function.GetAttrState(FunctionAttributeKey.ColorfulBegin));
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -134,7 +135,7 @@
Radius = (uint)Application.GetRealWidth(14),
BorderColor = CSS_Color.DividingLineColor,
BorderWidth = 1,
- BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function.GetAttrState(FunctionAttributeKey.ColorfulBegin)))
+ BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function.GetAttrState(FunctionAttributeKey.ColorfulEnd)))
};
endColorView.AddChidren(btnEndColor);
@@ -145,7 +146,7 @@
btnEndColor.BackgroundColor = color;
function.SetAttrState(FunctionAttributeKey.ColorfulEnd, color);
};
- var rgbView = new ColorfulSettingPage(action);
+ var rgbView = new ColorfulSettingPage(function, action,false);
MainPage.BasePageView.AddChidren(rgbView);
rgbView.LoadPage(function.GetAttrState(FunctionAttributeKey.ColorfulEnd));
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -155,7 +156,7 @@
#endregion
- #region 宸ヤ綔鏃堕暱
+ #region 鐐僵鍛ㄦ湡
var workHoursView = new FrameLayout()
{
Height = Application.GetRealHeight(50),
@@ -213,6 +214,11 @@
btnWorkHours.Text = hour + "鏃�";
btnWorkHours.Text += minute + "鍒�";
btnWorkHours.Text += second + "绉�";
+ new System.Threading.Thread(() => {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.ColorfulTime, (hour * 360 + minute * 60 + second).ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }) { IsBackground = true }.Start();
});
});
}
@@ -307,7 +313,7 @@
Height = Application.GetRealHeight(210),
Radius = (uint)Application.GetRealWidth(12),
};
- for (int i = 0; i <= 23; i += 1)
+ for (int i = 0; i <= 15; i += 1)
{
item1.Add(i+Language.StringByID(StringId.h));
}
--
Gitblit v1.8.0