From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 96 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 2f4ec1c..31b64f2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -1,18 +1,59 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
+using Shared;
+
namespace HDL_ON.UI
{
public partial class CurtainModulePage
{
+ /// <summary>
+ /// 鏇存柊绐楀笜鐘舵��
+ /// </summary>
+ public static void UpdataState(Curtain uCurtain)
+ {
+ Application.RunOnMainThread(() => {
+ if(bodyView == null)
+ {
+ return;
+ }
+ if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
+ {
+ if (uCurtain.trait_on_off.curValue.ToString() == "stop")
+ {
+ //bodyView.btnCurtainOpen.IsSelected = true;
+ //bodyView.btnCurtainClose.IsSelected = false;
+ //bodyView.btnCurtainStop.IsSelected = false;
+ //bodyView.btnCurtainBgIcon.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.trait_on_off.curValue.ToString() == "off")
+ {
+ //bodyView.btnCurtainOpen.IsSelected = false;
+ //bodyView.btnCurtainClose.IsSelected = true;
+ //bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainBgIcon.IsSelected = false;
+ }
+ }
+ });
+ }
+
void LoadEventList()
{
LoadCollectionEvent();
LoadEvent_ControlEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
};
+ UpdataState(curtain);
}
/// <summary>
/// 鏀惰棌鍔熻兘鎸夐挳浜嬩欢
@@ -20,8 +61,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = function.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.SaveFunctionData();
};
}
@@ -30,25 +71,50 @@
/// </summary>
void LoadEvent_ControlEvent()
{
- btnCurtainClose.MouseDownEventHandler += (sender, e) => {
- btnCurtainClose.IsSelected = true;
- };
- btnCurtainClose.MouseUpEventHandler += (sender, e) => {
+ btnCurtainClose.MouseUpEventHandler = (sender, e) => {
btnCurtainClose.IsSelected = false;
+ //btnCurtainStop.IsSelected = false;
+ //btnCurtainOpen.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.MouseDownEventHandler = (sender, e) =>
+ {
btnCurtainStop.IsSelected = true;
+ //btnCurtainClose.IsSelected = false;
+ //btnCurtainOpen.IsSelected = false;
};
- btnCurtainStop.MouseUpEventHandler += (sender, e) => {
- btnCurtainStop.IsSelected = false;
- };
-
- btnCurtainOpen.MouseDownEventHandler += (sender, e) => {
+ btnCurtainOpen.MouseDownEventHandler = (sender, e) => {
btnCurtainOpen.IsSelected = true;
};
- btnCurtainOpen.MouseUpEventHandler += (sender, e) => {
+ btnCurtainClose.MouseDownEventHandler = (sender, e) => {
+ btnCurtainClose.IsSelected = true;
+ };
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
+ {
+ //btnCurtainOpen.IsSelected = false;
+ //btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
+ curtain.trait_on_off.curValue = "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);
+ };
+ btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainOpen.IsSelected = false;
+ //btnCurtainClose.IsSelected = false;
+ //btnCurtainStop.IsSelected = false;
+ curtain.trait_on_off.curValue = "on";
+ //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);
};
}
--
Gitblit v1.8.0