From e2ffb5fce53119f5cb36e3b2466becbefa096842 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:09:13 +0800
Subject: [PATCH] Revert "20201120"
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 159 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 138 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index c8f1c0f..9da9e35 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -1,10 +1,51 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
+using Shared;
namespace HDL_ON.UI
{
public partial class RollingShutterPage
{
+ bool inControl = false;
+
+ /// <summary>
+ /// 鏇存柊绐楀笜
+ /// </summary>
+ /// <param name="uCurtain"></param>
+ public static void UpdataState(Curtain uCurtain)
+ {
+ Application.RunOnMainThread(() => {
+ if (bodyView == null)
+ return;
+ if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
+ {
+ if (uCurtain.trait_on_off.value.ToString() == "stop")
+ {
+ 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")
+ {
+ bodyView.btnCurtainOpen.IsSelected = false;
+ bodyView.btnCurtainClose.IsSelected = true;
+ bodyView.btnCurtainStop.IsSelected = false;
+ }
+ if ((DateTime.Now - uCurtain.refreshTime).TotalMilliseconds > 300 && !bodyView.inControl)
+ {
+ bodyView.controlBar.Progress = bodyView.curtainSeekBar.Progress = Convert.ToInt32(uCurtain.percent);
+ }
+ }
+ });
+ }
+
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
@@ -14,9 +55,10 @@
LoadCollectionEvent();
//鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ actionRefresh = () =>
+ {
+ btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
};
}
/// <summary>
@@ -24,38 +66,113 @@
/// </summary>
void LoadCollectionEvent()
{
- btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = function.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.MouseUpEventHandler += (sender, e) =>
+ {
+ btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ curtain.SaveFunctionData();
};
}
/// <summary>
- /// 鍔犺浇绐楀笜寮�鍏冲仠鎸夐挳鎺у埗浜嬩欢
+ /// 鍔犺浇绐楀笜鎺у埗浜嬩欢
/// </summary>
void LoadEvent_ControlEvent()
{
- btnCurtainClose.MouseDownEventHandler += (sender, e) => {
+ btnCurtainClose.MouseUpEventHandler = (sender, e) =>
+ {
btnCurtainClose.IsSelected = true;
- };
- btnCurtainClose.MouseUpEventHandler += (sender, e) => {
- btnCurtainClose.IsSelected = false;
- };
-
- btnCurtainStop.MouseDownEventHandler += (sender, e) => {
- btnCurtainStop.IsSelected = true;
- };
- btnCurtainStop.MouseUpEventHandler += (sender, e) => {
btnCurtainStop.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
+ 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.ins.SendWriteCommand(curtain, d);
};
- btnCurtainOpen.MouseDownEventHandler += (sender, e) => {
- btnCurtainOpen.IsSelected = true;
- };
- btnCurtainOpen.MouseUpEventHandler += (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.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(() =>
+ {
+ 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.OnStartTrackingTouchEvent = (sender, e) =>
+ {
+ inControl = true;
+ };
+ controlBar.OnStopTrackingTouchEvent = (sender, e) =>
+ {
+ inControl = false;
+ new System.Threading.Thread(() =>
+ {
+ 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