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/MotorCurtainPageBLL.cs | 69 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index c94975f..7638d01 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -19,14 +19,14 @@
return;
if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
{
- var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
- if (percentString != null)
- {
- int percent = 0;
- int.TryParse(percentString, out percent);
- bodyView.btnCurtainOpen.IsSelected = percent > 0;
- bodyView.btnCurtainClose.IsSelected = percent == 0;
- }
+ //var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+ //if (percentString != null)
+ //{
+ // int percent = 0;
+ // int.TryParse(percentString, out percent);
+ // bodyView.btnCurtainOpen.IsSelected = percent > 0;
+ // bodyView.btnCurtainClose.IsSelected = percent == 0;
+ //}
try
{
if (!bodyView.onCurtainAnimation)
@@ -53,6 +53,7 @@
//杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
bool runningDirection = progress > curtainSeekBar.Progress;
int curBarProgress = curtainSeekBar.Progress;
+ btnProgress.Text = progress + "%";
new System.Threading.Thread(() =>
{
try
@@ -63,24 +64,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;
@@ -136,13 +137,15 @@
{
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>();
@@ -171,13 +174,15 @@
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>();
@@ -190,16 +195,20 @@
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;
};
//btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
@@ -220,8 +229,9 @@
// DriverLayer.Control.Ins.SendWriteCommand(function, d);
//};
- //curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
- //{
+ curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ {
+ btnProgress.Text = curtainSeekBar.Progress + "%";
// controlBar.Progress = curtainSeekBar.Progress;
// new System.Threading.Thread(() =>
// {
@@ -235,9 +245,10 @@
// }
// })
// { IsBackground = true }.Start();
- //};
+ };
curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
+ btnProgress.Text = curtainSeekBar.Progress + "%";
//controlBar.Progress = curtainSeekBar.Progress;
new System.Threading.Thread(() =>
{
--
Gitblit v1.8.0