From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 1579e5b..f571b61 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -10,29 +10,29 @@
/// <summary>
/// 鏇存柊绐楀笜鐘舵��
/// </summary>
- public static void UpdataState(Curtain uCurtain)
+ public static void UpdataState(Function updataTemp)
{
- Application.RunOnMainThread((Action)(() => {
+ Application.RunOnMainThread(() => {
if(bodyView == null)
{
return;
}
- if (uCurtain.spk == bodyView.curtain.spk && uCurtain.sid == bodyView.curtain.sid)
+ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
{
- if (uCurtain.trait_on_off.curValue.ToString() == "stop")
+ if (updataTemp.trait_on_off.curValue.ToString() == "stop")
{
//bodyView.btnCurtainOpen.IsSelected = false;
//bodyView.btnCurtainClose.IsSelected = false;
//bodyView.btnCurtainStop.IsSelected = true;
}
- else if (uCurtain.trait_on_off.curValue.ToString() == "on")
+ else if (updataTemp.trait_on_off.curValue.ToString() == "on")
{
//bodyView.btnCurtainOpen.IsSelected = true;
//bodyView.btnCurtainClose.IsSelected = false;
//bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
- else if (uCurtain.trait_on_off.curValue.ToString() == "off")
+ else if (updataTemp.trait_on_off.curValue.ToString() == "off")
{
//bodyView.btnCurtainOpen.IsSelected = false;
//bodyView.btnCurtainClose.IsSelected = true;
@@ -40,7 +40,7 @@
bodyView.btnCurtainBgIcon.IsSelected = false;
}
}
- }));
+ });
}
void LoadEventList()
@@ -49,11 +49,11 @@
LoadEvent_ControlEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
- //curtain.SaveFunctionData(true);
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ //function.SaveFunctionData(true);
};
- UpdataState(curtain);
+ UpdataState(function);
}
/// <summary>
/// 鏀惰棌鍔熻兘鎸夐挳浜嬩欢
@@ -61,8 +61,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.CollectFunction();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -79,24 +79,32 @@
});
}) { IsBackground = true }.Start();
btnCurtainBgIcon.IsSelected = false;
- curtain.trait_on_off.curValue = "off";
+ function.trait_on_off.curValue = "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
+
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
btnCurtainStop.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
};
btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
{
btnCurtainOpen.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
};
btnCurtainClose.MouseDownEventHandler = (sender, e) =>
{
btnCurtainClose.IsSelected = true;
+ btnCurtainOpen.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
};
+
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
new System.Threading.Thread(() => {
@@ -106,10 +114,10 @@
});
})
{ IsBackground = true }.Start();
- curtain.trait_on_off.curValue = "stop";
+ function.trait_on_off.curValue = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
@@ -121,10 +129,10 @@
})
{ IsBackground = true }.Start();
btnCurtainBgIcon.IsSelected = true;
- curtain.trait_on_off.curValue = "on";
+ function.trait_on_off.curValue = "on";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
}
--
Gitblit v1.8.0