From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index c117f58..eb4ea70 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -86,7 +86,7 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -133,7 +133,7 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
//new Tip()
//{
@@ -159,32 +159,32 @@
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
- //light.brightness = e;
- //light.trait_on_off.curValue = e > 0 ? "on" : "off";
+ function.SetAttrState(FunctionAttributeKey.Brightness, e);
+ function.trait_on_off.curValue = e > 0 ? "on" : "off";
- //if (e == 0 || e == 100)
- //{
- // //Control.Send(CommandType_A.write, light);
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add("brightness", light.brightness.ToString());
- // Control.Ins.SendWriteCommand(light, d);
- //}
- //else
- //{
- // var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
- // Console.WriteLine("skip time "+tm);
- // if (300 < tm)
- // {
- // light.refreshTime = DateTime.Now;
- // new System.Threading.Thread(() =>
- // {
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add("brightness", light.brightness.ToString());
- // Control.Ins.SendWriteCommand(light, d);
- // })
- // { IsBackground = true }.Start();
- // }
- //}
+ if (e == 0 || e == 100)
+ {
+ //Control.Send(CommandType_A.write, light);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("brightness", e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }
+ else
+ {
+ var tm = (DateTime.Now - function.refreshTime).TotalMilliseconds;
+ Console.WriteLine("skip time " + tm);
+ if (500 < tm)
+ {
+ function.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("brightness", e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ })
+ { IsBackground = true }.Start();
+ }
+ }
};
}
@@ -203,7 +203,7 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -225,7 +225,7 @@
btnStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -246,7 +246,7 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -280,7 +280,7 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -311,7 +311,7 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -359,7 +359,7 @@
a31player.SetAttrState("song_step", "up");
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("song_step", "up");
- SendMethod.mMethod.SendControlCommand(a31player, dic);
+ SendMethod.Current.SendControlCommand(a31player, dic);
};
btnPrev.MouseUpEventHandler = (sender, e) =>
{
@@ -382,7 +382,7 @@
a31player.SetAttrState("on_off", status);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("on_off", status);
- SendMethod.mMethod.SendControlCommand(a31player, dic);
+ SendMethod.Current.SendControlCommand(a31player, dic);
};
///涓嬩竴鏇茬偣鍑讳簨浠�
btnNext.MouseDownEventHandler = (sender, e) =>
@@ -391,7 +391,7 @@
a31player.SetAttrState("song_step", "down");
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("song_step", "down");
- SendMethod.mMethod.SendControlCommand(a31player, dic);
+ SendMethod.Current.SendControlCommand(a31player, dic);
};
btnNext.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0