From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
old mode 100644
new mode 100755
index 0bf825b..ac77056
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -1,11 +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.trait_on_off.curValue.ToString() == "on";
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"RelayPage error {ex.Message}");
+ }
+ });
+ }
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
@@ -18,6 +37,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ //light.SaveFunctionData(true);
};
}
@@ -27,8 +47,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ light.SaveFunctionData(true);
};
}
@@ -37,27 +57,28 @@
/// </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.on_off = btnSwitch.IsSelected ? 1 : 0;
- Control.Send("write", this.light);
+ light.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", light.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, 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.on_off = btnSwitch.IsSelected ? 1 : 0;
- Control.Send("write", this.light);
+ light.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", light.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(light, d);
+ //Control.Send(CommandType_A.write, light);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0