From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 159 ++++++++++++++++++++++++++++------------------------
1 files changed, 86 insertions(+), 73 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index ac47acd..6a9bac7 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -86,16 +86,18 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
+ //DriverLayer.Control.Ins.GatewayOnline_Local = true;
+ //if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if(SPK.NotStatusSpkList.Contains( function.spk ))
@@ -133,7 +135,7 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣�
{
//new Tip()
//{
@@ -143,7 +145,7 @@
//}.Show(MainPage.BaseView);
return;
}
- if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
+ if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB || function.spk == SPK.LightCCT)
{
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
onDimmerBar = true;
@@ -159,32 +161,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,16 +205,16 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnClose.IsSelected = true;
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
@@ -225,16 +227,16 @@
btnStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
@@ -246,16 +248,16 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
@@ -280,7 +282,7 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -311,7 +313,7 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -359,7 +361,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 +384,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 +393,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) =>
{
@@ -405,7 +407,18 @@
/// </summary>
void LoadEvent_DivSkipEvent()
{
- var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor);
+ //if (function.spk == SPK.GroupControl)
+ //{
+ // EventHandler<MouseEventArgs> handler = (sender, e) => {
+ // var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+ // dialog.ShowDialog();
+ // };
+ // this.MouseUpEventHandler = handler;
+ // btnName.MouseUpEventHandler = handler;
+ // btnFromFloor.MouseUpEventHandler = handler;
+ // return;
+ //}
+ var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
this.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
btnFromFloor.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0