From 604341e5ef254ef6d4164423a342efef897a2172 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 22 一月 2021 17:51:48 +0800
Subject: [PATCH] 2021-1-22-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 72 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 02eb3ce..848bffa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -11,28 +12,27 @@
/// </summary>
public static void UpdataState(Curtain uCurtain)
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread((Action)(() => {
if(bodyView == null)
{
return;
}
- if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
+ if (uCurtain.spk == bodyView.curtain.spk && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.on_off == "stop")
+ if (uCurtain.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")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
- else if (uCurtain.on_off == "on")
- {
- bodyView.btnCurtainOpen.IsSelected = true;
- bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
- bodyView.btnCurtainBgIcon.IsSelected = true;
- }
- else if (uCurtain.on_off == "off")
+ else if (uCurtain.trait_on_off.curValue.ToString() == "off")
{
bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = true;
@@ -40,7 +40,7 @@
bodyView.btnCurtainBgIcon.IsSelected = false;
}
}
- });
+ }));
}
void LoadEventList()
@@ -51,6 +51,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
+ //curtain.SaveFunctionData(true);
};
UpdataState(curtain);
}
@@ -60,8 +61,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.CollectFunction();
};
}
@@ -74,31 +75,46 @@
btnCurtainClose.IsSelected = true;
btnCurtainStop.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- curtain.on_off = "off";
- Control.Send(CommandType_A.write,curtain);
+ btnCurtainBgIcon.IsSelected = false;
+ curtain.trait_on_off.curValue = "off";
+ //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);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) =>
- {
- btnCurtainStop.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
- };
+ //btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnCurtainStop.IsSelected = true;
+ // //btnCurtainClose.IsSelected = false;
+ // //btnCurtainOpen.IsSelected = false;
+ //};
+ //btnCurtainOpen.MouseDownEventHandler = (sender, e) => {
+ // btnCurtainOpen.IsSelected = true;
+ //};
+ //btnCurtainClose.MouseDownEventHandler = (sender, e) => {
+ // btnCurtainClose.IsSelected = true;
+ //};
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = true;
+ btnCurtainOpen.IsSelected = false;
btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.on_off = "stop";
- Control.Send(CommandType_A.write, curtain);
+ btnCurtainStop.IsSelected = true;
+ 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.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.on_off = "on";
- Control.Send(CommandType_A.write, curtain);
+ btnCurtainBgIcon.IsSelected = true;
+ curtain.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);
};
}
--
Gitblit v1.8.0