From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 153 ++++++++++++++++++++++++++++-----------------------
1 files changed, 84 insertions(+), 69 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 511c748..775b792 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -19,17 +19,21 @@
return;
if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
{
- var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
- int percent = 0;
- int.TryParse(percentString, out percent);
- bodyView.btnCurtainOpen.IsSelected = percent > 0;
- bodyView.btnCurtainClose.IsSelected = percent == 0;
+ //var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+ //int percent = 0;
+ //int.TryParse(percentString, out percent);
+ //bodyView.btnCurtainOpen.IsSelected = percent > 0;
+ //bodyView.btnCurtainClose.IsSelected = percent == 0;
try
{
- if (!bodyView.onCurtainAnimation)
- {
- bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
- }
+ var progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent));
+ bodyView.curtainSeekBar.Progress = progress;
+ bodyView.btnProgress.Text = progress + "%";
+
+ //if (!bodyView.onCurtainAnimation)
+ //{
+ // bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
+ //}
}
catch { }
}
@@ -50,6 +54,7 @@
//杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
bool runningDirection = progress > curtainSeekBar.Progress;
int curBarProgress = curtainSeekBar.Progress;
+ btnProgress.Text = progress + "%";
new System.Threading.Thread(() =>
{
try
@@ -60,24 +65,24 @@
{
if (runningDirection)
{
- if (curtainSeekBar.Progress + 10 > progress)
+ if (curtainSeekBar.Progress + 5 > progress)
{
curtainSeekBar.Progress = progress;
}
else
{
- curtainSeekBar.Progress = curtainSeekBar.Progress + 10;
+ curtainSeekBar.Progress = curtainSeekBar.Progress + 5;
}
}
else
{
- if (curtainSeekBar.Progress - 10 < progress)
+ if (curtainSeekBar.Progress - 5 < progress)
{
curtainSeekBar.Progress = progress;
}
else
{
- curtainSeekBar.Progress = curtainSeekBar.Progress - 10;
+ curtainSeekBar.Progress = curtainSeekBar.Progress - 5;
}
}
curBarProgress = curtainSeekBar.Progress;
@@ -133,19 +138,21 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- //new System.Threading.Thread(() => {
- // System.Threading.Thread.Sleep(2000);
- // Application.RunOnMainThread(() => {
- // btnCurtainClose.IsSelected = false;
- // });
- //})
- //{ IsBackground = true }.Start();
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnCurtainClose.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
function.trait_on_off.curValue = "off";
function.SetAttrState(FunctionAttributeKey.Percent, 0);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(function, d);
- CurtainAnimation(0);
+ //CurtainAnimation(100);
};
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
@@ -166,53 +173,59 @@
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- //new System.Threading.Thread(() => {
- // System.Threading.Thread.Sleep(2000);
- // Application.RunOnMainThread(() => {
- // btnCurtainOpen.IsSelected = false;
- // });
- //})
- //{ IsBackground = true }.Start();
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnCurtainOpen.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
function.trait_on_off.curValue = "on";
function.SetAttrState(FunctionAttributeKey.Percent, 100);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(function, d);
- CurtainAnimation(100);
+ //CurtainAnimation(0);
};
- 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) =>
{
btnCurtainStop.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
};
btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
{
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
};
btnCurtainClose.MouseDownEventHandler = (sender, e) =>
{
btnCurtainClose.IsSelected = true;
btnCurtainOpen.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
};
@@ -234,7 +247,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);
@@ -246,36 +260,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