From 604341e5ef254ef6d4164423a342efef897a2172 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 22 一月 2021 17:51:48 +0800
Subject: [PATCH] 2021-1-22-1
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index a8cd892..533498c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -12,12 +12,12 @@
/// <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")
{
@@ -46,7 +46,7 @@
}
catch { }
}
- });
+ }));
}
/// <summary>
@@ -135,7 +135,7 @@
btnCollection.MouseUpEventHandler += (sender, e) =>
{
btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData(true);
+ curtain.CollectFunction();
};
}
@@ -184,23 +184,23 @@
CurtainAnimation(curtain.percent);
};
- 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);
- };
+ //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);
- };
+ //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 +220,7 @@
//};
curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- controlBar.Progress = curtainSeekBar.Progress;
+ //controlBar.Progress = curtainSeekBar.Progress;
new System.Threading.Thread(() =>
{
curtain.percent = e;
@@ -249,19 +249,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