From c3e1b733fc45bd9f0b88bfb560cfa87a270b079b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 九月 2020 17:33:58 +0800
Subject: [PATCH] 20200909
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 100 ++++++++++++++------------------------------------
1 files changed, 28 insertions(+), 72 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 501e41a..676ac1c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -37,9 +37,9 @@
}
if ((DateTime.Now - uCurtain.refreshTime).TotalMilliseconds > 300)
{
- bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.openLevel);
+ bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.percent);
}
-
+
}
});
@@ -54,7 +54,8 @@
LoadCollectionEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () => {
+ actionRefresh = () =>
+ {
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
};
@@ -64,7 +65,8 @@
/// </summary>
void LoadCollectionEvent()
{
- btnCollection.MouseUpEventHandler += (sender, e) => {
+ btnCollection.MouseUpEventHandler += (sender, e) =>
+ {
btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
curtain.SaveFunctionData();
};
@@ -75,24 +77,27 @@
/// </summary>
void LoadEvent_ControlEvent()
{
- btnCurtainClose.MouseUpEventHandler = (sender, e) => {
+ btnCurtainClose.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainClose.IsSelected = true;
btnCurtainStop.IsSelected = false;
btnCurtainOpen.IsSelected = false;
curtain.trait_on_off.value = "off";
- curtain.openLevel = 0;
+ curtain.percent = 0;
//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);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) => {
+ btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ {
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
};
- btnCurtainStop.MouseUpEventHandler = (sender, e) => {
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
@@ -103,12 +108,13 @@
Control.SendWriteCommand(curtain, d);
};
- btnCurtainOpen.MouseUpEventHandler = (sender, e) => {
+ btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
curtain.trait_on_off.value = "on";
- curtain.openLevel = 100;
+ curtain.percent = 100;
//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());
@@ -117,73 +123,23 @@
DateTime delayTime = DateTime.MinValue;
- btnMinusSignIcon.MouseLongEventHandler = (sender, e) => {
- //if (curtain.openLevel > 1)
- //{
- // curtain.openLevel--;
- // controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel;
- // delayTime = DateTime.Now;
- // new System.Threading.Thread(() => {
- // while (delayTime != DateTime.MaxValue)
- // {
- // System.Threading.Thread.Sleep(100);
- // if ((DateTime.Now - delayTime).TotalSeconds > 1)
- // {
- // if (curtain.openLevel < 1)
- // {
- // break;
- // }
- // curtain.openLevel--;
- // Application.RunOnMainThread(() => {
- // controlBar.Progress = curtain.openLevel;
- // });
- // }
- // }
- // })
- // { IsBackground = true }.Start();
- //}
- };
- btnMinusSignIcon.MouseUpEventHandler = (sender, e) => {
+ btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
+ {
delayTime = DateTime.MinValue;
//Control.Send(CommandType_A.write, curtain);
- curtain.openLevel--;
+ curtain.percent--;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("openLevel", curtain.openLevel.ToString());
+ d.Add("percent", curtain.percent.ToString());
Control.SendWriteCommand(curtain, d);
};
- btnPlusSgnIcon.MouseLongEventHandler = (sender, e) => {
- //if (curtain.openLevel > 1)
- //{
- // curtain.openLevel++;
- // controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel;
- // delayTime = DateTime.Now;
- // new System.Threading.Thread(() => {
- // while (delayTime != DateTime.MaxValue)
- // {
- // System.Threading.Thread.Sleep(100);
- // if ((DateTime.Now - delayTime).TotalSeconds > 1)
- // {
- // if (curtain.openLevel > 99)
- // {
- // break;
- // }
- // curtain.openLevel++;
- // Application.RunOnMainThread(() => {
- // controlBar.Progress = curtain.openLevel;
- // });
- // }
- // }
- // })
- // { IsBackground = true }.Start();
- //}
- };
- btnPlusSgnIcon.MouseUpEventHandler = (sender, e) => {
+ btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
+ {
delayTime = DateTime.MinValue;
//Control.Send(CommandType_A.write, curtain);
- curtain.openLevel++;
+ curtain.percent++;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("openLevel", curtain.openLevel.ToString());
+ d.Add("percent", curtain.percent.ToString());
Control.SendWriteCommand(curtain, d);
};
@@ -195,10 +151,10 @@
if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
{
delayTime = DateTime.Now;
- curtain.openLevel = e;
+ 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("openLevel", curtain.openLevel.ToString());
+ d.Add("percent", curtain.percent.ToString());
Control.SendWriteCommand(curtain, d);
curtain.refreshTime = DateTime.Now;
}
@@ -215,10 +171,10 @@
if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
{
delayTime = DateTime.Now;
- curtain.openLevel = e;
+ 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("openLevel", curtain.openLevel.ToString());
+ d.Add("percent", curtain.percent.ToString());
Control.SendWriteCommand(curtain, d);
curtain.refreshTime = DateTime.Now;
}
--
Gitblit v1.8.0