From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 6e796b2..3b326f5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -17,19 +17,19 @@
return;
if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.trait_on_off.value.ToString() == "stop")
+ if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.trait_on_off.value.ToString() == "on")
+ else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.trait_on_off.value.ToString() == "off")
+ else if (uCurtain.trait_on_off.curValue.ToString() == "off")
{
bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = true;
@@ -58,6 +58,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
+ curtain.SaveFunctionData(true);
};
}
/// <summary>
@@ -67,8 +68,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData();
+ btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.SaveFunctionData(true);
};
}
@@ -82,10 +83,10 @@
btnCurtainClose.IsSelected = true;
btnCurtainStop.IsSelected = false;
btnCurtainOpen.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());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
@@ -100,9 +101,9 @@
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.value = "stop";
+ curtain.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.value.ToString());
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
@@ -111,10 +112,10 @@
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.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());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
--
Gitblit v1.8.0