From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 21782a6..1441781 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -50,12 +50,12 @@
/// <summary>
/// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
/// </summary>
- void LoadEvent_FunctionCollection(Button btn,Function function,bool isDevice)
+ void LoadEvent_FunctionCollection(Button btn,Function function)
{
btn.MouseUpEventHandler += (sender, e) =>
{
- function.collection = false;
- if(function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ function.collect = false;
+ if (function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
{
if ((function as Music.A31MusicModel).ServerClientType == 1)
{
@@ -64,15 +64,22 @@
}
}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
- if (isDevice)
- {
- LoadDeviceFunctionControlZone();
- }
- else
- {
- LoadSceneFunctionControlZone();
- }
+ LoadDeviceFunctionControlZone();
function.SaveFunctionData();
+ new PublicAssmebly().TipMsgAutoClose(msg, true);
+ };
+ }
+ /// <summary>
+ /// 鍔犺浇鍦烘櫙鏀惰棌鎸夐挳浜嬩欢
+ /// </summary>
+ void LoadEvent_SceneCollection(Button btn, Scene scene)
+ {
+ btn.MouseUpEventHandler += (sender, e) =>
+ {
+ scene.collect = false;
+ string msg = scene.name + Language.StringByID(StringId.CollectionCancelled);
+ LoadSceneFunctionControlZone();
+ scene.SaveSceneData();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -147,7 +154,7 @@
{
if (view.Tag.ToString() == function.sid)
{
- var state = function.trait_on_off.value.ToString() == "on";
+ var state = function.trait_on_off.curValue.ToString() == "on";
for (int i = 0; i < view.ChildrenCount; i++)
{
if (view.GetChildren(i).GetType() == typeof(Button))
@@ -181,14 +188,14 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd,Button btnName,Button btnZone ,Function function)
+ void LoadEvent_ControlScene(Button btnCoverd,Button btnName,Button btnZone ,Scene scene)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
+ string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Ins.ControlScene(function as Scene);
+ Control.Ins.ControlScene(scene);
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
@@ -207,9 +214,9 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.value.ToString());
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
@@ -240,10 +247,10 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
btnClose.IsSelected = false;
- curtain.trait_on_off.value = "off";
+ curtain.trait_on_off.curValue = "off";
curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off",curtain.trait_on_off.value.ToString());
+ d.Add("on_off",curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -254,13 +261,31 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
btnOpen.IsSelected = false;
- curtain.trait_on_off.value = "on";
+ curtain.trait_on_off.curValue = "on";
curtain.percent = 100;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.value.ToString());
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
}
+ /// <summary>
+ /// 鍔犺浇璺宠浆淇℃伅涓績椤甸潰
+ /// </summary>
+ void LoadEvent_GotoMessageCenterPage()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ var skipPage = new MessageCenterPage();
+ MainPage.BasePageView.AddChidren(skipPage);
+ skipPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnMsgBg.MouseUpEventHandler = eventHandler;
+ btnMsgTime.MouseUpEventHandler = eventHandler;
+ btnMsg.MouseUpEventHandler = eventHandler;
+ btnMsgIcon.MouseUpEventHandler = eventHandler;
+ }
+
}
}
--
Gitblit v1.8.0