From 7d5d552de16a149fafdc2d255ce50a86e7bef431 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 11 三月 2021 09:37:47 +0800
Subject: [PATCH] 临时上传一个安卓蓝牙的版本
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 3b6c85e..1579e5b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -11,28 +12,27 @@
/// </summary>
public static void UpdataState(Curtain uCurtain)
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread((Action)(() => {
if(bodyView == null)
{
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.value.ToString() == "stop")
+ if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
- //bodyView.btnCurtainOpen.IsSelected = true;
+ //bodyView.btnCurtainOpen.IsSelected = false;
//bodyView.btnCurtainClose.IsSelected = false;
- //bodyView.btnCurtainStop.IsSelected = false;
- //bodyView.btnCurtainBgIcon.IsSelected = true;
+ //bodyView.btnCurtainStop.IsSelected = true;
}
- else if (uCurtain.trait_on_off.value.ToString() == "on")
+ else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
//bodyView.btnCurtainOpen.IsSelected = true;
//bodyView.btnCurtainClose.IsSelected = false;
//bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
- 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;
@@ -40,7 +40,7 @@
bodyView.btnCurtainBgIcon.IsSelected = false;
}
}
- });
+ }));
}
void LoadEventList()
@@ -51,6 +51,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
+ //curtain.SaveFunctionData(true);
};
UpdataState(curtain);
}
@@ -60,8 +61,8 @@
void LoadCollectionEvent()
{
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.CollectFunction();
};
}
@@ -71,49 +72,59 @@
void LoadEvent_ControlEvent()
{
btnCurtainClose.MouseUpEventHandler = (sender, e) => {
- btnCurtainClose.IsSelected = false;
- //btnCurtainStop.IsSelected = false;
- //btnCurtainOpen.IsSelected = false;
- curtain.trait_on_off.value = "off";
- //Control.Send(CommandType_A.write,curtain);
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() => {
+ btnCurtainClose.IsSelected = false;
+ });
+ }) { IsBackground = true }.Start();
+ btnCurtainBgIcon.IsSelected = false;
+ curtain.trait_on_off.curValue = "off";
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());
+ Control.Ins.SendWriteCommand(curtain, d);
};
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
btnCurtainStop.IsSelected = true;
- //btnCurtainClose.IsSelected = false;
- //btnCurtainOpen.IsSelected = false;
};
- btnCurtainOpen.MouseDownEventHandler = (sender, e) => {
+ btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
+ {
btnCurtainOpen.IsSelected = true;
};
- btnCurtainClose.MouseDownEventHandler = (sender, e) => {
+ btnCurtainClose.MouseDownEventHandler = (sender, e) =>
+ {
btnCurtainClose.IsSelected = true;
};
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- //btnCurtainOpen.IsSelected = false;
- //btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.value = "stop";
- //Control.Send(CommandType_A.write, curtain);
+ 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("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = false;
- //btnCurtainClose.IsSelected = false;
- //btnCurtainStop.IsSelected = false;
- curtain.trait_on_off.value = "on";
- //Control.Send(CommandType_A.write, curtain);
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() => {
+ btnCurtainOpen.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
+ btnCurtainBgIcon.IsSelected = true;
+ curtain.trait_on_off.curValue = "on";
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());
+ Control.Ins.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0