From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index aa710ba..9da9e35 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -20,19 +20,19 @@
return;
if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.trait_on_off.curValue.ToString() == "stop")
+ if (uCurtain.trait_on_off.value.ToString() == "stop")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.trait_on_off.curValue.ToString() == "on")
+ else if (uCurtain.trait_on_off.value.ToString() == "on")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.trait_on_off.curValue.ToString() == "off")
+ else if (uCurtain.trait_on_off.value.ToString() == "off")
{
bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = true;
@@ -59,7 +59,6 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
- curtain.SaveFunctionData();
};
}
/// <summary>
@@ -84,12 +83,12 @@
btnCurtainClose.IsSelected = true;
btnCurtainStop.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- curtain.trait_on_off.curValue = "off";
+ curtain.trait_on_off.value = "off";
curtain.percent = 0;
//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.curValue.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
@@ -103,11 +102,11 @@
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.curValue = "stop";
+ curtain.trait_on_off.value = "stop";
//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.curValue.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
@@ -115,12 +114,12 @@
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.curValue = "on";
+ curtain.trait_on_off.value = "on";
curtain.percent = 100;
//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.curValue.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
@@ -129,7 +128,7 @@
curtain.percent--;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("percent", curtain.percent.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
@@ -137,7 +136,7 @@
curtain.percent++;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("percent", curtain.percent.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
curtainSeekBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -151,7 +150,7 @@
curtain.percent = e;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("percent", curtain.percent.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
curtain.refreshTime = DateTime.Now;
})
{ IsBackground = true }.Start();
@@ -169,7 +168,7 @@
curtain.percent = e;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("percent", curtain.percent.ToString());
- Control.Ins.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
curtain.refreshTime = DateTime.Now;
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0