From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 99 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 422e4b2..a639e02 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -86,16 +86,16 @@
btnSwitch.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;
+ }
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if(SPK.NotStatusSpkList.Contains( function.spk ))
@@ -133,16 +133,16 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- //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;
+ }
if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
@@ -280,16 +280,16 @@
};
btnUp.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;
+ }
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -311,16 +311,16 @@
};
btnDown.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;
+ }
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -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) =>
{
@@ -405,7 +405,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