From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 71 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 676ac1c..9da9e35 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -6,6 +7,8 @@
{
public partial class RollingShutterPage
{
+ bool inControl = false;
+
/// <summary>
/// 鏇存柊绐楀笜
/// </summary>
@@ -35,12 +38,10 @@
bodyView.btnCurtainClose.IsSelected = true;
bodyView.btnCurtainStop.IsSelected = false;
}
- if ((DateTime.Now - uCurtain.refreshTime).TotalMilliseconds > 300)
+ if ((DateTime.Now - uCurtain.refreshTime).TotalMilliseconds > 300 && !bodyView.inControl)
{
bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.percent);
}
-
-
}
});
}
@@ -87,7 +88,7 @@
//Control.Send(CommandType_A.write, curtain);
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);
+ Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
@@ -105,7 +106,7 @@
//Control.Send(CommandType_A.write, curtain);
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);
+ Control.ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
@@ -118,70 +119,60 @@
//Control.Send(CommandType_A.write, curtain);
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);
+ Control.ins.SendWriteCommand(curtain, d);
};
- DateTime delayTime = DateTime.MinValue;
btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
{
- delayTime = DateTime.MinValue;
- //Control.Send(CommandType_A.write, curtain);
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.ins.SendWriteCommand(curtain, d);
};
btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
{
- delayTime = DateTime.MinValue;
- //Control.Send(CommandType_A.write, curtain);
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.ins.SendWriteCommand(curtain, d);
};
-
- curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ curtainSeekBar.OnStartTrackingTouchEvent = (sender, e) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ inControl = true;
+ };
+ curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ inControl = false;
new System.Threading.Thread(() =>
{
- if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
- {
- delayTime = DateTime.Now;
- curtain.percent = e;
- //Control.Send(CommandType_A.write, curtain);
- 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.refreshTime = DateTime.Now;
- }
+ curtain.percent = e;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("percent", curtain.percent.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
+ curtain.refreshTime = DateTime.Now;
})
{ IsBackground = true }.Start();
};
- controlBar.OnProgressChangedEvent = (sender, e) =>
+ controlBar.OnStartTrackingTouchEvent = (sender, e) =>
{
- curtainSeekBar.Progress = controlBar.Progress;
+ inControl = true;
+ };
+ controlBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ inControl = false;
new System.Threading.Thread(() =>
{
- MainPage.Log(delayTime.ToLongTimeString());
- if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
- {
- delayTime = DateTime.Now;
- curtain.percent = e;
- //Control.Send(CommandType_A.write, curtain);
- 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.refreshTime = DateTime.Now;
- }
+ curtain.percent = e;
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add("percent", curtain.percent.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
+ curtain.refreshTime = DateTime.Now;
})
{ IsBackground = true }.Start();
};
-
}
}
}
--
Gitblit v1.8.0