From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index c962b0c..40b565c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -86,7 +86,7 @@
curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
@@ -103,7 +103,7 @@
curtain.trait_on_off.value = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
@@ -115,65 +115,84 @@
curtain.percent = 100;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
};
-
- DateTime delayTime = DateTime.MinValue;
btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
{
- delayTime = DateTime.MinValue;
curtain.percent--;
controlBar.Progress = curtain.percent;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("percent", curtain.percent.ToString());
- Control.SendWriteCommand(curtain, d);
- //Control.Send(CommandType_A.write, curtain);
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
};
btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
{
- delayTime = DateTime.MinValue;
curtain.percent++;
controlBar.Progress = curtain.percent;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("percent", curtain.percent.ToString());
- Control.SendWriteCommand(curtain, d);
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
};
- curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ //curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ //{
+ // controlBar.Progress = curtainSeekBar.Progress;
+ // new System.Threading.Thread(() =>
+ // {
+ // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - curtain.refreshTime).TotalMilliseconds > 300)
+ // {
+ // curtain.percent = e;
+ // curtain.refreshTime = DateTime.Now;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add("percent", curtain.percent.ToString());
+ // Control.SendWriteCommand(curtain, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //};
+ curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
controlBar.Progress = curtainSeekBar.Progress;
new System.Threading.Thread(() =>
{
- if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
- {
- delayTime = DateTime.Now;
- curtain.percent = e;
- curtain.refreshTime = DateTime.Now;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("percent", curtain.percent.ToString());
- Control.SendWriteCommand(curtain, d);
- }
+ curtain.percent = e;
+ curtain.refreshTime = DateTime.Now;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("percent", curtain.percent.ToString());
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
})
{ IsBackground = true }.Start();
};
- controlBar.OnProgressChangedEvent = (sender, e) =>
+ //controlBar.OnProgressChangedEvent = (sender, e) =>
+ //{
+ // curtainSeekBar.Progress = controlBar.Progress;
+ // new System.Threading.Thread(() =>
+ // {
+ // if (controlBar.Progress == 0 || controlBar.Progress == 100 || (DateTime.Now - curtain.refreshTime).TotalMilliseconds > 300)
+ // {
+ // curtain.percent = e;
+ // curtain.refreshTime = DateTime.Now;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add("percent", curtain.percent.ToString());
+ // Control.SendWriteCommand(curtain, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //};
+
+ controlBar.OnStopTrackingTouchEvent = (sender, e) =>
{
curtainSeekBar.Progress = controlBar.Progress;
new System.Threading.Thread(() =>
{
- MainPage.Log(delayTime.ToLongTimeString());
- if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
- {
- delayTime = DateTime.Now;
- curtain.percent = e;
- curtain.refreshTime = DateTime.Now;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("percent", curtain.percent.ToString());
- Control.SendWriteCommand(curtain, d);
- }
+ curtain.percent = e;
+ curtain.refreshTime = DateTime.Now;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("percent", curtain.percent.ToString());
+ DriverLayer.Control.ins.SendWriteCommand(curtain, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0