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/RollingShutterPageBLL.cs | 221 +++++++++++++++++++++----------------------------------
1 files changed, 84 insertions(+), 137 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 70ba7eb..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>
@@ -17,30 +20,28 @@
return;
if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.on_off == "stop")
+ if (uCurtain.trait_on_off.value.ToString() == "stop")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.on_off == "on")
+ else if (uCurtain.trait_on_off.value.ToString() == "on")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.on_off == "off")
+ else if (uCurtain.trait_on_off.value.ToString() == "off")
{
bodyView.btnCurtainOpen.IsSelected = false;
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.openLevel);
+ bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.percent);
}
-
-
}
});
}
@@ -54,7 +55,8 @@
LoadCollectionEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () => {
+ actionRefresh = () =>
+ {
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
};
@@ -64,9 +66,10 @@
/// </summary>
void LoadCollectionEvent()
{
- btnCollection.MouseUpEventHandler += (sender, e) => {
+ btnCollection.MouseUpEventHandler += (sender, e) =>
+ {
btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ curtain.SaveFunctionData();
};
}
@@ -75,157 +78,101 @@
/// </summary>
void LoadEvent_ControlEvent()
{
- btnCurtainClose.MouseUpEventHandler = (sender, e) => {
+ btnCurtainClose.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainClose.IsSelected = true;
btnCurtainStop.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- curtain.on_off = "off";
- curtain.openLevel = 0;
+ curtain.trait_on_off.value = "off";
+ 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.on_off.ToString());
- Control.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(curtain, d);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) => {
+ btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ {
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
};
- btnCurtainStop.MouseUpEventHandler = (sender, e) => {
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.on_off = "stop";
- //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.on_off.ToString());
- Control.SendWriteCommand(curtain, d);
- };
-
- btnCurtainOpen.MouseUpEventHandler = (sender, e) => {
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.on_off = "on";
- curtain.openLevel = 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.on_off.ToString());
- Control.SendWriteCommand(curtain, d);
- };
-
- 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) => {
- delayTime = DateTime.MinValue;
- //Control.Send(CommandType_A.write, curtain);
- curtain.openLevel--;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("openLevel", curtain.openLevel.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) => {
- delayTime = DateTime.MinValue;
- //Control.Send(CommandType_A.write, curtain);
- curtain.openLevel++;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("openLevel", curtain.openLevel.ToString());
- Control.SendWriteCommand(curtain, d);
- };
-
- curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ btnCurtainOpen.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
+ curtain.trait_on_off.value = "stop";
+ //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.ins.SendWriteCommand(curtain, d);
+ };
+
+ btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
+ {
+ btnCurtainOpen.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
+ curtain.trait_on_off.value = "on";
+ 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());
+ Control.ins.SendWriteCommand(curtain, d);
+ };
+
+
+ btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ curtain.percent--;
+ 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);
+ };
+
+ btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ curtain.percent++;
+ 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);
+ };
+ curtainSeekBar.OnStartTrackingTouchEvent = (sender, e) =>
+ {
+ inControl = true;
+ };
+ curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ inControl = false;
new System.Threading.Thread(() =>
{
- if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
- {
- delayTime = DateTime.Now;
- curtain.openLevel = 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());
- 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.openLevel = 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());
- 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