From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 139 +++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 80 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 6e2169f..676ac1c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -17,19 +17,19 @@
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;
@@ -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,9 +65,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,99 +77,70 @@
/// </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;
- Control.Send(CommandType_A.write, curtain);
+ 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.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;
- curtain.on_off = "stop";
- Control.Send(CommandType_A.write, curtain);
+ 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.SendWriteCommand(curtain, d);
};
- btnCurtainOpen.MouseUpEventHandler = (sender, e) => {
+ 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);
+ 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.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) => {
+ btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
+ {
delayTime = DateTime.MinValue;
- Control.Send(CommandType_A.write, curtain);
+ //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);
};
- 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);
+ //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);
};
curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
@@ -178,8 +151,11 @@
if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
{
delayTime = DateTime.Now;
- curtain.openLevel = e;
- Control.Send(CommandType_A.write, curtain);
+ 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;
}
})
@@ -195,8 +171,11 @@
if ((DateTime.Now - delayTime).TotalMilliseconds > 300)
{
delayTime = DateTime.Now;
- curtain.openLevel = e;
- Control.Send(CommandType_A.write, curtain);
+ 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;
}
})
--
Gitblit v1.8.0