From 6b6a3fd9c292a75196c4cc15c6d9bf52537efbd4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 07 九月 2021 10:12:20 +0800
Subject: [PATCH] 1.窗帘问题。2.智能空开。3.组合调光部分。
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 83 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 3405938..a1a2aa8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -50,6 +50,7 @@
//杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
bool runningDirection = progress > curtainSeekBar.Progress;
int curBarProgress = curtainSeekBar.Progress;
+ btnProgress.Text = progress + "%";
new System.Threading.Thread(() =>
{
try
@@ -185,23 +186,23 @@
CurtainAnimation(100);
};
- btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
- {
- controlBar.Progress -= 1;
- function.SetAttrState(FunctionAttributeKey.Percent, controlBar.Progress);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, controlBar.Progress.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(function, d);
- };
+ //btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
+ //{
+ // controlBar.Progress -= 1;
+ // function.SetAttrState(FunctionAttributeKey.Percent, controlBar.Progress);
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.Percent, controlBar.Progress.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ //};
- btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
- {
- controlBar.Progress += 1;
- function.SetAttrState(FunctionAttributeKey.Percent, controlBar.Progress);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, controlBar.Progress.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(function, d);
- };
+ //btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
+ //{
+ // controlBar.Progress += 1;
+ // function.SetAttrState(FunctionAttributeKey.Percent, controlBar.Progress);
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.Percent, controlBar.Progress.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ //};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
@@ -242,7 +243,8 @@
//};
curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ //controlBar.Progress = curtainSeekBar.Progress;
+ btnProgress.Text = curtainSeekBar.Progress + "%";
new System.Threading.Thread(() =>
{
function.SetAttrState(FunctionAttributeKey.Percent, e);
@@ -254,36 +256,37 @@
{ IsBackground = true }.Start();
};
- //controlBar.OnProgressChangedEvent = (sender, e) =>
+ curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ {
+ btnProgress.Text = curtainSeekBar.Progress + "%";
+ // new System.Threading.Thread(() =>
+ // {
+ // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - function.refreshTime).TotalMilliseconds > 300)
+ // {
+ // function.percent = e;
+ // function.refreshTime = DateTime.Now;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add("percent", function.percent.ToString());
+ // Control.SendWriteCommand(function, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ };
+
+ //controlBar.OnStopTrackingTouchEvent = (sender, e) =>
//{
// curtainSeekBar.Progress = controlBar.Progress;
+ // btnProgress.Text = curtainSeekBar.Progress + "%";
// new System.Threading.Thread(() =>
// {
- // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - function.refreshTime).TotalMilliseconds > 300)
- // {
- // function.percent = e;
- // function.refreshTime = DateTime.Now;
- // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- // d.Add("percent", function.percent.ToString());
- // Control.SendWriteCommand(function, d);
- // }
+ // function.SetAttrState(FunctionAttributeKey.Percent, e);
+ // function.refreshTime = DateTime.Now;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add("percent", e.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
// })
// { IsBackground = true }.Start();
//};
-
- controlBar.OnStopTrackingTouchEvent = (sender, e) =>
- {
- curtainSeekBar.Progress = controlBar.Progress;
- new System.Threading.Thread(() =>
- {
- function.SetAttrState(FunctionAttributeKey.Percent, e);
- function.refreshTime = DateTime.Now;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("percent", e.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(function, d);
- })
- { IsBackground = true }.Start();
- };
}
}
--
Gitblit v1.8.0