From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 769d4f9..6fc5a4a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -1,10 +1,33 @@
锘縰sing System;
using HDL_ON.Entity;
+using Shared;
namespace HDL_ON.UI
{
public partial class RelayPage
{
+ /// <summary>
+ /// 鏇存柊鐏厜鐘舵��
+ /// </summary>
+ public static void UpdataState(Function updataTemp)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ if (bodyView == null)
+ return;
+ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
+ {
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"RelayPage error {ex.Message}");
+ }
+ });
+ }
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
@@ -12,6 +35,13 @@
{
LoadSwitchEvent();
LoadCollectionEvent();
+
+ //鍥為��鍒锋柊淇℃伅浜嬩欢
+ actionRefresh = () => {
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ //function.SaveFunctionData(true);
+ };
}
/// <summary>
@@ -20,8 +50,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -30,29 +60,50 @@
/// </summary>
void LoadSwitchEvent()
{
- btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
+ btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected;
-
+ btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
- var light = this.light as Light;
- light.state = btnSwitch.IsSelected ? 1 : 0;
- Control.Send("write", this.light, 3);
+ function.trait_on_off.curValue = btnSwitchIcon.IsSelected ? "on" : "off";
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
- btnSwitch.MouseUpEventHandler += (sender, e) =>
+ btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected;
-
+ btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- var light = this.light as Light;
- light.state = btnSwitch.IsSelected ? 1 : 0;
- Control.Send("write", this.light, 3);
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
+
+ //new System.Threading.Thread(() =>
+ //{
+ // bool fff = false;
+ // while (true)
+ // {
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // if (fff)
+ // {
+ // d.Add("on_off", "off");
+ // }
+ // else
+ // {
+ // d.Add("on_off", "on");
+ // }
+ // fff = !fff;
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ // //System.Threading.Thread.Sleep(100);
+ // }
+ //})
+ //{ IsBackground = true }.Start();
};
}
--
Gitblit v1.8.0