From 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 13:59:45 +0800
Subject: [PATCH] 2022年06月30日13:59:08
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 8281d85..023c828 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -88,6 +88,16 @@
/// </summary>
void LoadColorChangeEvent()
{
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
DateTime colorChangeTime = DateTime.MinValue;
//bool send = false;
@@ -197,64 +207,75 @@
};
}
+ bool curDimmerStatus = false;
/// <summary>
/// 鐏厜璋冨厜浜嬩欢
/// </summary>
void LoadEvent_DimmerBar()
{
- dimmerBar.OnStartTrackingTouchEvent = (sender, e)=>{
- onDimmerBar = true;
- };
- dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
- new System.Threading.Thread(() => {
- System.Threading.Thread.Sleep(200);
- onDimmerBar = false;
- })
- { IsBackground = true }.Start();
+
+ dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
+ curDimmerStatus = false;
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
-
+
Control.Ins.SendWriteCommand(function, d);
};
- dimmerBar.OnProgressChangedEvent = (sender, e) => {
- //function.fadeTime = 0;
- //if (!btnSwitch.IsSelected)
- //{
- // dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
- //}
- //btnSwitch.IsSelected = e > 0 ? true : false;
- //function.brightness = e;
- //function.trait_on_off.curValue = e > 0 ? "on" : "off";
+ //if (function.online)
+ {
+ dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
+ {
+ curDimmerStatus = onDimmerBar = true;
+ };
+ dimmerBar.OnProgressChangedEvent = (sender, e) =>
+ {
+ if (!btnSwitch.IsSelected)
+ {
+ dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ }
+ btnSwitch.IsSelected = e > 0 ? true : false;
+ function.trait_on_off.curValue = e > 0 ? "on" : "off";
- //if (e == 0 || e == 100)
- //{
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
- // Control.Ins.SendWriteCommand(function, d);
- //}
- //else
- //{
- // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
- // {
- // function.refreshTime = DateTime.Now;
- // new System.Threading.Thread(() =>
- // {
- // //Control.Send(CommandType_A.write, function);
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
- // Control.Ins.SendWriteCommand(function, d);
- // })
- // { IsBackground = true }.Start();
- // }
- // else
- // {
- // MainPage.Log("skip dimmer control!!");
- // }
- //}
- };
+ if (e == 0 || e == 100)
+ {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }
+ else
+ {
+ if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
+ {
+ function.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ //Control.Send(CommandType_A.write, function);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ MainPage.Log("skip dimmer control!!");
+ }
+ }
+ };
+ }
}
-
/// <summary>
/// 淇敼鐏厜娓愬彉鏃堕棿
/// </summary>
@@ -309,6 +330,10 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
+ //if (!function.online)
+ //{
+ // return;
+ //}
if(function.trait_on_off.curValue.ToString() == "off")
{
return;
--
Gitblit v1.8.0