From d13ce7db9d7188c237df446dcc51e25af64ca321 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:36:34 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 1c22cb3..66a2ff8 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -76,13 +76,25 @@
/// </summary>
void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
{
+
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
+
+ if(SPK.NotStatusSpkList.Contains( function.spk ))
+ {
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() => {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ });
+ }) { IsBackground = true }.Start();
+ }
+
new System.Threading.Thread(() =>
{
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
if(fadeTime!= null)
{
@@ -281,6 +293,8 @@
/// <param name="curtain"></param>
void LoadEvent_ControlMusic(Button btnPlay,Button btnNext,Button btnPrev, A31MusicModel a31player)
{
+ if (a31player == null)
+ return;
///涓婁竴鏇茬偣鍑讳簨浠�
btnPrev.MouseDownEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0