From a7d20263f28aa009ef8e064a7f9700d7cd642492 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 10:06:47 +0800
Subject: [PATCH] 2020-06-10-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 82 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index d03631c..bf72473 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -1,22 +1,46 @@
锘縰sing System;
using HDL_ON.Entity;
-
+using Shared;
namespace HDL_ON.UI
{
public partial class DimmerPage
{
+ /// <summary>
+ /// 鏇存柊鍔熻兘鐘舵��
+ /// </summary>
+ public static void UpdataStates(Light uFunction)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ if (bodyView == null)
+ return;
+ if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
+ {
+ bodyView.dimmerBar.Progress = uFunction.brightness;
+ // bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
+ }
+ });
+ }
+
void LoadEventList()
{
-
LoadSwitchEvent();
LoadCollectionEvent();
+ LoadEvent_DimmerBar();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
};
}
-
/// <summary>
/// 鏀惰棌鍔熻兘鎸夐挳浜嬩欢
@@ -30,6 +54,51 @@
}
/// <summary>
+ /// 鐏厜璋冨厜浜嬩欢
+ /// </summary>
+ void LoadEvent_DimmerBar()
+ {
+ dimmerBar.OnStartTrackingTouchEvent = (sender, e) => {
+ onDimmerBar = true;
+ };
+ dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
+ onDimmerBar = false;
+ light.brightness = dimmerBar.Progress;
+ Control.Send(CommandType_A.write, light);
+ };
+ dimmerBar.OnProgressChangedEvent = (sender, e) => {
+ if (!btnSwitch.IsSelected)
+ {
+ //dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
+ }
+ btnSwitch.IsSelected = e > 0 ? true : false;
+ light.brightness = e;
+ light.on_off = e > 0 ? "on" : "off";
+
+ if (e == 0 || e == 100)
+ {
+ Control.Send(CommandType_A.write, this.light);
+ }
+ else
+ {
+ if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
+ {
+ light.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ Control.Send(CommandType_A.write, light);
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ MainPage.Log("skip control!!");
+ }
+ }
+ };
+ }
+
+ /// <summary>
/// 鍔犺浇寮�鍏充簨浠�
/// </summary>
void LoadSwitchEvent()
@@ -37,12 +106,11 @@
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
-
+ //dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
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, this.light);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0