From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 142 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 62 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index a8cd892..702c4d7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -12,30 +12,20 @@
/// <param name="uCurtain"></param>
public static void UpdataState(Curtain uCurtain)
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread((Action)(() => {
if (bodyView == null)
return;
if (bodyView.onControl)
return;
- if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
+ if (uCurtain.spk == bodyView.curtain.spk && uCurtain.sid == bodyView.curtain.sid)
{
- if (uCurtain.trait_on_off.curValue.ToString() == "stop")
+ var percentString = uCurtain.GetAttrState(FunctionAttributeKey.Percent);
+ if (percentString != null)
{
- 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.curValue.ToString() == "off")
- {
- bodyView.btnCurtainOpen.IsSelected = false;
- bodyView.btnCurtainClose.IsSelected = true;
- bodyView.btnCurtainStop.IsSelected = false;
+ int percent = 0;
+ int.TryParse(percentString, out percent);
+ bodyView.btnCurtainOpen.IsSelected = percent > 0;
+ bodyView.btnCurtainClose.IsSelected = percent == 0;
}
try
{
@@ -46,7 +36,7 @@
}
catch { }
}
- });
+ }));
}
/// <summary>
@@ -135,7 +125,7 @@
btnCollection.MouseUpEventHandler += (sender, e) =>
{
btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData(true);
+ curtain.CollectFunction();
};
}
@@ -146,11 +136,15 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainClose.IsSelected = true;
- btnCurtainOpen.IsSelected = false;
- btnCurtainStop.IsSelected = false;
+ //new System.Threading.Thread(() => {
+ // System.Threading.Thread.Sleep(2000);
+ // Application.RunOnMainThread(() => {
+ // btnCurtainClose.IsSelected = false;
+ // });
+ //})
+ //{ IsBackground = true }.Start();
curtain.trait_on_off.curValue = "off";
- curtain.percent = 100;
+ curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
@@ -159,48 +153,72 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
-
- btnCurtainStop.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainOpen.IsSelected = false;
+ onCurtainAnimation = false;
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnCurtainStop.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
curtain.trait_on_off.curValue = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
- onCurtainAnimation = false;
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
-
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- btnCurtainOpen.IsSelected = true;
+ //new System.Threading.Thread(() => {
+ // System.Threading.Thread.Sleep(2000);
+ // Application.RunOnMainThread(() => {
+ // btnCurtainOpen.IsSelected = false;
+ // });
+ //})
+ //{ IsBackground = true }.Start();
curtain.trait_on_off.curValue = "on";
- curtain.percent = 0;
+ curtain.percent = 100;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
CurtainAnimation(curtain.percent);
};
- btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
+
+ btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
- curtain.percent--;
- controlBar.Progress = curtain.percent;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ btnCurtainStop.IsSelected = true;
+ };
+ btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
+ {
+ btnCurtainOpen.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ };
+ btnCurtainClose.MouseDownEventHandler = (sender, e) =>
+ {
+ btnCurtainClose.IsSelected = true;
+ btnCurtainOpen.IsSelected = false;
};
- btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
- {
- curtain.percent++;
- controlBar.Progress = curtain.percent;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
- DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
- };
+ //btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
+ //{
+ // curtain.percent--;
+ // controlBar.Progress = curtain.percent;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ //};
+
+ //btnPlusSgnIcon.MouseUpEventHandler = (sender, e) =>
+ //{
+ // curtain.percent++;
+ // controlBar.Progress = curtain.percent;
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.Percent, curtain.percent.ToString());
+ // DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
+ //};
//curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
//{
@@ -220,7 +238,7 @@
//};
curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ //controlBar.Progress = curtainSeekBar.Progress;
new System.Threading.Thread(() =>
{
curtain.percent = e;
@@ -249,19 +267,19 @@
// { IsBackground = true }.Start();
//};
- controlBar.OnStopTrackingTouchEvent = (sender, e) =>
- {
- curtainSeekBar.Progress = controlBar.Progress;
- new System.Threading.Thread(() =>
- {
- 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.OnStopTrackingTouchEvent = (sender, e) =>
+ //{
+ // curtainSeekBar.Progress = controlBar.Progress;
+ // new System.Threading.Thread(() =>
+ // {
+ // 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