From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index c3780c3..2059963 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -24,6 +24,14 @@
btn.MouseUpEventHandler += (sender, e) =>
{
function.collection = false;
+ if(function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ {
+ if ((function as Music.A31MusicModel).ServerClientType == 1)
+ {
+ (function as Music.A31MusicModel).MainPlayCollection = false;
+ Music.A31MusicModel.Save();
+ }
+ }
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
if (isDevice)
{
@@ -33,7 +41,7 @@
{
LoadSceneFunctionControlZone();
}
- DB_ResidenceData.residenceData.SaveResidenceData();
+ function.SaveFunctionData();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -108,7 +116,7 @@
{
if (view.Tag.ToString() == function.sid)
{
- var state = function.on_off == "on";
+ var state = function.trait_on_off.value.ToString() == "on";
for (int i = 0; i < view.ChildrenCount; i++)
{
if (view.GetChildren(i).GetType() == typeof(Button))
@@ -117,7 +125,14 @@
btn.IsSelected = state;
if (btn.Tag != null && btn.Tag.ToString() == "state")
{
- btn.Text = function.lastState;
+ if(function.functionCategory == FunctionCategory.Music)
+ {
+ btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
+ }
+ else
+ {
+ btn.Text = function.lastState;
+ }
}
}
}
@@ -135,19 +150,18 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd ,Function function)
+ void LoadEvent_ControlScene(Button btnCoverd,Button btnName,Button btnZone ,Function function)
{
- btnCoverd.MouseDownEventHandler = (sender, e) =>
- {
- btnCoverd.IsSelected = true;
- };
- btnCoverd.MouseUpEventHandler = (sender, e) =>
+
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function as Scene);
+ Control.Send(function);
};
-
+ btnCoverd.MouseUpEventHandler = eventHandler;
+ btnName.MouseUpEventHandler = eventHandler;
+ btnZone.MouseUpEventHandler = eventHandler;
}
/// <summary>
@@ -162,8 +176,12 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- function.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, function);
+ function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ //Control.Send(CommandType_A.write, function);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", function.trait_on_off.value.ToString());
+ Control.SendWriteCommand(function, d);
+
})
{ IsBackground = true }.Start();
};
@@ -193,8 +211,11 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
btnClose.IsSelected = false;
- curtain.on_off = "off";
- Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.value = "off";
+ //Control.Send(CommandType_A.write, curtain);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off",curtain.trait_on_off.value.ToString());
+ Control.SendWriteCommand(curtain, d);
};
btnOpen.MouseDownEventHandler = (sender, e) =>
@@ -204,8 +225,11 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
btnOpen.IsSelected = false;
- curtain.on_off = "on";
- Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.value = "on";
+ //Control.Send(CommandType_A.write, curtain);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
+ Control.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0