From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 131 +++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 54 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index c962b0c..428a93c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -17,19 +17,19 @@
return;
if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.trait_on_off.value.ToString() == "stop")
+ if (uCurtain.trait_on_off.curValue.ToString() == "stop")
+ {
+ bodyView.btnCurtainOpen.IsSelected = false;
+ bodyView.btnCurtainClose.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = true;
+ }
+ else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
bodyView.btnCurtainOpen.IsSelected = true;
bodyView.btnCurtainClose.IsSelected = false;
bodyView.btnCurtainStop.IsSelected = false;
}
- else if (uCurtain.trait_on_off.value.ToString() == "on")
- {
- bodyView.btnCurtainOpen.IsSelected = true;
- bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
- }
- else if (uCurtain.trait_on_off.value.ToString() == "off")
+ else if (uCurtain.trait_on_off.curValue.ToString() == "off")
{
bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = true;
@@ -58,6 +58,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
+ //curtain.SaveFunctionData(true);
};
}
/// <summary>
@@ -67,8 +68,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData();
+ btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.SaveFunctionData(true);
};
}
@@ -82,28 +83,31 @@
btnCurtainClose.IsSelected = true;
btnCurtainStop.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- curtain.trait_on_off.value = "off";
+ curtain.trait_on_off.curValue = "off";
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);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ DriverLayer.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;
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- };
- btnCurtainStop.MouseUpEventHandler = (sender, e) =>
- {
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.value = "stop";
+ curtain.trait_on_off.curValue = "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);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
@@ -111,69 +115,88 @@
btnCurtainOpen.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.value = "on";
+ curtain.trait_on_off.curValue = "on";
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);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ 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