From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 258 ++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 124 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 8593e14..bdfc709 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -26,9 +26,12 @@
if (!bodyView.onDimmerBar)
{
bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
- }
- bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
- bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+ }
+ if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0")
+ {
+ bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+ }
}
else
{
@@ -38,8 +41,8 @@
bodyView.barColorTemplatrue.Enable = updataTemp.trait_on_off.curValue.ToString() == "on";
var cct = 27;
int.TryParse(updataTemp.GetAttrState(FunctionAttributeKey.CCT), out cct);
- bodyView.barColorTemplatrue.Progress = cct / 100;
- //璁剧疆鍒濆鍊�
+ bodyView.barColorTemplatrue.Progress = cct / 100;
+ //璁剧疆鍒濆鍊�
bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");
}
@@ -59,7 +62,7 @@
LoadEvet_ChangeFadeTime();
LoadEvet_ChangeColorTemplatrue();
//鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () =>
+ actionRefresh = () =>
{
btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
@@ -71,54 +74,54 @@
/// </summary>
void LoadEvet_ChangeFadeTime()
{
- if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
- {
- barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
- {
- function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
- function.SaveFunctionFile();
- };
- }
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ function.SaveFunctionFile();
+ };
+ }
}
/// <summary>
/// 淇敼鑹叉俯
/// </summary>
void LoadEvet_ChangeColorTemplatrue()
- {
- //if (!function.online)
- //{
- // new Tip()
- // {
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- // }.Show(MainPage.BaseView);
- // return;
- //}
+ {
+ if (!function.online)
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ Direction = AMPopTipDirection.None,
+ }.Show(MainPage.BaseView);
+ return;
+ }
barColorTemplatrue.OnProgressChangedEvent += (sender, value) =>
{
- new System.Threading.Thread(() =>
- {
- Application.RunOnMainThread(() =>
- {
- //璁剧疆鑷畾涔夌殑鏂囨湰
- barColorTemplatrue.SetCustomText(value * 100 + "K");
- function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
- //System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- //d.Add(FunctionAttributeKey.CCT, function.Attr_CCT.curValue.ToString());
- //Control.Ins.SendWriteCommand(function, d);
+ new System.Threading.Thread(() =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //璁剧疆鑷畾涔夌殑鏂囨湰
+ barColorTemplatrue.SetCustomText(value * 100 + "K");
+ function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
+ //System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ //d.Add(FunctionAttributeKey.CCT, function.Attr_CCT.curValue.ToString());
+ //Control.Ins.SendWriteCommand(function, d);
});
//System.Threading.Thread.Sleep(200);
}).Start();
- };
-
+ };
+
barColorTemplatrue.OnStopTrackingTouchEvent = (sender, value) =>
- {
- function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.CCT, (value * 100 ).ToString());
- Control.Ins.SendWriteCommand(function, d);
+ {
+ function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.CCT, (value * 100 ).ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
}
@@ -134,79 +137,82 @@
};
}
+ bool curDimmerStatus = false;
/// <summary>
/// 鐏厜璋冨厜浜嬩欢
/// </summary>
void LoadEvent_DimmerBar()
{
- dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
- {
- //if (!function.online)
- //{
- // new Tip()
- // {
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- // }.Show(MainPage.BaseView);
- // return;
- //}
- onDimmerBar = false;
+ dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ if (!function.online)
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ Direction = AMPopTipDirection.None,
+ }.Show(MainPage.BaseView);
+ return;
+ }
+ //onDimmerBar = false;
+ curDimmerStatus = false;
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
+ d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
+ if (dimmerBar.Progress > 0)
+ {
+ d.Add(FunctionAttributeKey.OnOff, "on");
+ }
Control.Ins.SendWriteCommand(function, d);
//function.fadeTime = barFadeTime.Progress;
- btnBrightnessText.Text = dimmerBar.Progress + "%";
-
- dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- };
- //if (function.online)
- {
- dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
- {
- onDimmerBar = true;
- };
- dimmerBar.OnProgressChangedEvent = (sender, e) =>
- {
- dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- //function.fadeTime = 0;
- //if (!btnSwitch.IsSelected)
- //{
- // dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
- //}
- //btnSwitch.IsSelected = e > 0 ? true : false;
- //function.brightness = e;
- //function.trait_on_off.curValue = e > 0 ? "on" : "off";
-
- //if (e == 0 || e == 100)
- //{
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
- // Control.Ins.SendWriteCommand(function, d);
- //}
- //else
- //{
- // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
- // {
- // function.refreshTime = DateTime.Now;
- // new System.Threading.Thread(() =>
- // {
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
- // Control.Ins.SendWriteCommand(function, d);
- // })
- // { IsBackground = true }.Start();
- // }
- //}
-
- //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);
- //btnBrightnessText.Text = function.brightness + "%";
-
- btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
- btnBrightnessText.Text = dimmerBar.Progress + "%";
- };
-
+ btnBrightnessText.Text = dimmerBar.Progress + "%";
+
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ };
+ //if (function.online)
+ {
+ dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
+ {
+ curDimmerStatus = onDimmerBar = true;
+ };
+ dimmerBar.OnProgressChangedEvent = (sender, e) =>
+ {
+ //dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ if (!btnSwitch.IsSelected)
+ {
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ }
+ btnSwitch.IsSelected = e > 0 ? true : false;
+ function.trait_on_off.curValue = e > 0 ? "on" : "off";
+
+ if (e == 0 || e == 100)
+ {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ }
+ else
+ {
+ if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
+ {
+ function.refreshTime = DateTime.Now;
+ new System.Threading.Thread(() =>
+ {
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Brightness, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
+ })
+ { IsBackground = true }.Start();
+ }
+ }
+
+
+ btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+ btnBrightnessText.Text = dimmerBar.Progress + "%";
+ };
+
}
}
@@ -216,17 +222,17 @@
void LoadSwitchEvent()
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
- {
- //if (!function.online)
- //{
- // new Tip()
- // {
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- // }.Show(MainPage.BaseView);
- // return;
- //}
+ {
+ if (!function.online)
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ Direction = AMPopTipDirection.None,
+ }.Show(MainPage.BaseView);
+ return;
+ }
//function.fadeTime = barFadeTime.Progress;
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
@@ -242,14 +248,18 @@
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(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
- if (btnSwitch.IsSelected)
- {
- d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
- }
- else
- {
- function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
- }
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+ }
+ //if (btnSwitch.IsSelected)
+ //{
+ // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+ //}
+ //else
+ //{
+ // function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
+ //}
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0