From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 32a9eec..3f50e31 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;
@@ -83,11 +83,11 @@
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());
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -102,10 +102,10 @@
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());
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -114,11 +114,11 @@
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());
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
--
Gitblit v1.8.0