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/1-HomePage/HomePageBLL.cs | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index ea6db63..02efd04 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -34,11 +34,11 @@
{
if (Control.Ins.IsRemote)
{
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
}
else
{
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
}
}
else
@@ -190,14 +190,58 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Scene scene)
+ void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
+ //鍦烘櫙姝ｅ湪鍊掕鏃舵墽琛屼腑锛屼笉鍏佽鍐嶇偣鍑�
+ if (scene.LastExecutionTime == "" || Convert.ToDouble(scene.LastExecutionTime) + Convert.ToDouble(scene.delay) < Convert.ToDouble(Utlis.GetTimestamp(false)))
+ {
+ scene.LastExecutionTime = Utlis.GetTimestamp(false);
+ }
+ else
+ {
+ return;
+ }
string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
Control.Ins.ControlScene(scene);
+ scene.SceneCountDown(btnShowDelay);
+ //new System.Threading.Thread(() => {
+ // int time = Convert.ToInt32(scene.delay);
+ // if (time > 0)
+ // {
+ // while (time > 0)
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (time / 60 > 1)
+ // {
+ // btnShowDelay.Text = (time / 60).ToString() + "min";
+ // }
+ // else
+ // {
+ // btnShowDelay.Text = (time--).ToString() + "s";
+ // }
+ // });
+ // if (time / 60 > 1)
+ // {
+ // System.Threading.Thread.Sleep(time / 60 * 60000);
+ // }
+ // else
+ // {
+ // System.Threading.Thread.Sleep(1000);
+ // }
+ // }
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnShowDelay.Text = "";
+ // });
+ // }
+ //})
+ //{ IsBackground = true, Priority = System.Threading.ThreadPriority.BelowNormal }.Start();
+
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
@@ -217,9 +261,27 @@
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>();
- d.Add("on_off", function.trait_on_off.curValue.ToString());
- Control.Ins.SendWriteCommand(function, d);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
+ {
+ var light = function as Light;
+ d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+ if (btnSwitch.IsSelected)
+ {
+ d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ }
+ else
+ {
+ light.lastBrightness = light.brightness;
+ }
+ d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
+ Control.Ins.SendWriteCommand(light, d);
+ }
+ else
+ {
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }
})
{ IsBackground = true }.Start();
};
@@ -348,11 +410,8 @@
{
ShowMesBtnState(pushMessageInfoList[0], true);
});
-
}
-
}
-
}
else
{
@@ -366,9 +425,7 @@
{
isGetting = false;
}
-
});
-
}
/// <summary>
--
Gitblit v1.8.0