From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 769d4f9..28f1f7e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -1,10 +1,30 @@
锘縰sing System;
using HDL_ON.Entity;
+using Shared;
namespace HDL_ON.UI
{
public partial class RelayPage
{
+ /// <summary>
+ /// 鏇存柊鐏厜鐘舵��
+ /// </summary>
+ public static void UpdataState(Light uLight)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ if (bodyView == null)
+ return;
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.on_off == "on";
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"RelayPage error {ex.Message}");
+ }
+ });
+ }
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
@@ -12,6 +32,12 @@
{
LoadSwitchEvent();
LoadCollectionEvent();
+
+ //鍥為��鍒锋柊淇℃伅浜嬩欢
+ actionRefresh = () => {
+ btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ };
}
/// <summary>
@@ -20,7 +46,7 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = !btnCollection.IsSelected;
+ btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
DB_ResidenceData.residenceData.SaveResidenceData();
};
}
@@ -32,25 +58,21 @@
{
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);
+ light.on_off = btnSwitchIcon.IsSelected ? "on" : "off";
+ Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
};
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);
+ light.on_off = btnSwitch.IsSelected ? "on" : "off";
+ Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0