From ccdff82fac4bcc1067ec806ade5ae897f1214f4d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 四月 2021 14:41:53 +0800
Subject: [PATCH] 异常捕获
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 692d673..7d61094 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -40,7 +40,7 @@
{
if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
{
- //btn.Progress = (upfunc as Light).trait_brightness.value.value.ToString() == "on";
+ btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
}
}
}
@@ -76,13 +76,25 @@
/// </summary>
void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
{
+
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
+
+ if(function.spk == SPK.IrLearn || function.spk == SPK.TvIr)
+ {
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() => {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ });
+ }) { IsBackground = true }.Start();
+ }
+
new System.Threading.Thread(() =>
{
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
if(fadeTime!= null)
{
@@ -109,10 +121,8 @@
{
if (function.Spk_Prefix == FunctionCategory.Light)
{
- var light = function as Light;
- 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>();
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(function, d);
}
@@ -128,7 +138,6 @@
{
if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
- var light = function as Light;
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
onDimmerBar = true;
(bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = false;
@@ -136,10 +145,10 @@
dimmerControlBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
(bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = true;
- light.brightness = dimmerControlBar.Progress;
+ function.SetAttrState(FunctionAttributeKey.Brightness, dimmerControlBar.Progress.ToString());
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("brightness", light.brightness.ToString());
- Control.Ins.SendWriteCommand(light, d);
+ d.Add(FunctionAttributeKey.Brightness, dimmerControlBar.Progress.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
@@ -183,7 +192,7 @@
/// <param name="btnStop"></param>
/// <param name="btnOpen"></param>
/// <param name="btnClose"></param>
- void LoadEvent_ControlCurtain(Button btnStop, Button btnOpen, Button btnClose, Curtain curtain)
+ void LoadEvent_ControlCurtain(Button btnStop, Button btnOpen, Button btnClose, Function curtain)
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
@@ -191,9 +200,9 @@
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
curtain.trait_on_off.curValue = "off";
- curtain.percent = 0;
+ curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -204,7 +213,7 @@
btnOpen.IsSelected = false;
curtain.trait_on_off.curValue = "stop";
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -214,9 +223,9 @@
btnClose.IsSelected = false;
btnStop.IsSelected = false;
curtain.trait_on_off.curValue = "on";
- curtain.percent = 100;
+ curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0