From 068c68295cad1967f7aafb4e5e951260ef03d4ce Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 09:16:43 +0800
Subject: [PATCH] 状态属性更改，不要轻易合并
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 1579e5b..d37b3a4 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)(() => {
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.state.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.state.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.state.ToString() == "off")
{
//bodyView.btnCurtainOpen.IsSelected = false;
//bodyView.btnCurtainClose.IsSelected = true;
@@ -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,10 +79,10 @@
});
}) { IsBackground = true }.Start();
btnCurtainBgIcon.IsSelected = false;
- curtain.trait_on_off.curValue = "off";
+ function.trait_on_off.state = "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.state.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
@@ -106,10 +106,10 @@
});
})
{ IsBackground = true }.Start();
- curtain.trait_on_off.curValue = "stop";
+ function.trait_on_off.state = "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.state.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
@@ -121,10 +121,10 @@
})
{ IsBackground = true }.Start();
btnCurtainBgIcon.IsSelected = true;
- curtain.trait_on_off.curValue = "on";
+ function.trait_on_off.state = "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.state.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
}
--
Gitblit v1.8.0