From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 164 +++++++++++++++++++++++++++++-------------------------
1 files changed, 87 insertions(+), 77 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 66fc68d..4fed9cb 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.Music;
using Shared;
@@ -8,29 +9,65 @@
public partial class FunctionControlZone
{
/// <summary>
+ /// 鏇存柊寮�鍏崇姸鎬�
+ /// </summary>
+ /// <param name="upfunc"></param>
+ public static void UpdataOnOffState(Function upfunc)
+ {
+ if(bodyDiv!= null)
+ {
+ Application.RunOnMainThread(() => {
+ if(bodyDiv.Tag.ToString() == upfunc.sid)
+ {
+ for (var o = 0; o < bodyDiv.ChildrenCount; o++)
+ {
+ if (bodyDiv.GetChildren(o).GetType() == typeof(Button))
+ {
+ var btn = bodyDiv.GetChildren(o) as Button;
+ if (btn.Tag != null)
+ {
+ if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
+ {
+ btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
+ }
+ }
+ }
+ else if (bodyDiv.GetChildren(o).GetType() == typeof(DiyImageSeekBar))
+ {
+ var btn = bodyDiv.GetChildren(o) as DiyImageSeekBar;
+ if (btn.Tag != null)
+ {
+ if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
+ {
+ //btn.Progress = (upfunc as Light).trait_brightness.value.value.ToString() == "on";
+ }
+ }
+ }
+ }
+
+ }
+ });
+ }
+ }
+ /// <summary>
+ /// 鏇存柊浜害鐘舵��
+ /// </summary>
+ /// <param name="upfunc"></param>
+ static void UpdataBrightnessState(Function upfunc)
+ {
+
+ }
+
+ /// <summary>
/// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
/// </summary>
void LoadEvent_FunctionCollection()
{
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
- btnCollectionIcon.IsSelected = function.collection = !btnCollectionIcon.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollectionIcon.IsSelected = function.collect = !btnCollectionIcon.IsSelected;
+ function.SaveFunctionData(true);
};
- }
- /// <summary>
- /// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
- /// </summary>
- void LoadEvent_ControlScene()
- {
- EventHandler<MouseEventArgs> upEvent = (sender, e) => {
- Control.Send(function);
- string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
- new PublicAssmebly().TipMsgAutoClose(msg, false);
- };
- btnName.MouseUpEventHandler = upEvent;
- btnFromFloor.MouseUpEventHandler = upEvent;
- bodyDiv.MouseUpEventHandler = upEvent;
}
/// <summary>
@@ -43,11 +80,11 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- function.on_off = btnSwitch.IsSelected ? "on" : "off";
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.on_off.ToString());
- Control.SendWriteCommand(function, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
@@ -67,11 +104,11 @@
if (function.functionCategory == FunctionCategory.Light)
{
var light = function as Light;
- light.on_off = btnSwitch.IsSelected ? "on" : "off";
+ light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.on_off.ToString());
- Control.SendWriteCommand(function, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
}
})
{ IsBackground = true }.Start();
@@ -83,76 +120,49 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- //if (function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
- //{
- // if (dimmerControlBar == null)
- // return;
- // var light = function as Light;
- // dimmerControlBar.OnProgressChangedEvent += (sender, e) =>
- // {
- // if ((DateTime.Now - light.refreshTime).TotalMilliseconds > 200)//璋冨厜鍛戒护鍙戦�侀棿闅斾簨浠�
- // {
- // new System.Threading.Thread(() =>
- // {
- // light.refreshTime = DateTime.Now;
- // light.brightness = e;
- // Control.Send(CommandType_A.write, function);
- // })
- // { IsBackground = true }.Start();
- // }
- // };
- // dimmerControlBar.OnStopTrackingTouchEvent += (sender, e) =>
- // {
- // light.brightness = dimmerControlBar.Progress;
- // Control.Send(CommandType_A.write, function);
- // };
- //}
if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
{
var light = function as Light;
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
onDimmerBar = true;
+ (bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = false;
};
dimmerControlBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
+ (bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = true;
light.brightness = dimmerControlBar.Progress;
- //Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(light, d);
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
light.brightness = e;
- light.on_off = e > 0 ? "on" : "off";
+ light.trait_on_off.curValue = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
//Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(light, d);
}
else
{
- if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
+ var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
+ Console.WriteLine("skip time "+tm);
+ if (300 < tm)
{
light.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- //Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
- else
- {
- MainPage.Log("skip dimmer control!!");
- }
}
};
-
}
}
@@ -173,29 +183,29 @@
btnClose.IsSelected = true;
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
- curtain.on_off = "off";
- //Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.curValue = "off";
+ curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.on_off.ToString());
- Control.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
- btnStop.MouseDownEventHandler = (sender, e) =>
+ //btnStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnStop.IsSelected = true;
+ // btnClose.IsSelected = false;
+ // btnOpen.IsSelected = false;
+ //};
+ btnStop.MouseUpEventHandler = (sender, e) =>
{
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
- };
- btnStop.MouseUpEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- btnClose.IsSelected = false;
- btnStop.IsSelected = false;
- curtain.on_off = "stop";
- //Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.curValue = "stop";
+ //curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.on_off.ToString());
- Control.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
btnOpen.MouseUpEventHandler = (sender, e) =>
@@ -203,11 +213,11 @@
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
- curtain.on_off = "on";
- //Control.Send(CommandType_A.write, curtain);
+ curtain.trait_on_off.curValue = "on";
+ curtain.percent = 100;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", curtain.on_off.ToString());
- Control.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
}
#endregion
--
Gitblit v1.8.0