From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index edf2b6d..848bffa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -12,36 +12,35 @@
/// </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.curValue.ToString() == "stop")
{
- //bodyView.btnCurtainOpen.IsSelected = true;
- //bodyView.btnCurtainClose.IsSelected = false;
- //bodyView.btnCurtainStop.IsSelected = false;
- //bodyView.btnCurtainBgIcon.IsSelected = true;
+ 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;
+ bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainClose.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "off")
{
- //bodyView.btnCurtainOpen.IsSelected = false;
- //bodyView.btnCurtainClose.IsSelected = true;
- //bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainOpen.IsSelected = false;
+ bodyView.btnCurtainClose.IsSelected = true;
+ bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = false;
}
}
- });
+ }));
}
void LoadEventList()
@@ -63,7 +62,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- curtain.SaveFunctionData(true);
+ curtain.CollectFunction();
};
}
@@ -73,9 +72,10 @@
void LoadEvent_ControlEvent()
{
btnCurtainClose.MouseUpEventHandler = (sender, e) => {
- btnCurtainClose.IsSelected = false;
- //btnCurtainStop.IsSelected = false;
- //btnCurtainOpen.IsSelected = false;
+ btnCurtainClose.IsSelected = true;
+ btnCurtainStop.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
+ btnCurtainBgIcon.IsSelected = false;
curtain.trait_on_off.curValue = "off";
//Control.Send(CommandType_A.write,curtain);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -83,36 +83,35 @@
Control.Ins.SendWriteCommand(curtain, d);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) =>
- {
- btnCurtainStop.IsSelected = true;
- //btnCurtainClose.IsSelected = false;
- //btnCurtainOpen.IsSelected = false;
- };
- btnCurtainOpen.MouseDownEventHandler = (sender, e) => {
- btnCurtainOpen.IsSelected = true;
- };
- btnCurtainClose.MouseDownEventHandler = (sender, e) => {
- btnCurtainClose.IsSelected = true;
- };
+ //btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnCurtainStop.IsSelected = true;
+ // //btnCurtainClose.IsSelected = false;
+ // //btnCurtainOpen.IsSelected = false;
+ //};
+ //btnCurtainOpen.MouseDownEventHandler = (sender, e) => {
+ // btnCurtainOpen.IsSelected = true;
+ //};
+ //btnCurtainClose.MouseDownEventHandler = (sender, e) => {
+ // btnCurtainClose.IsSelected = true;
+ //};
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- //btnCurtainOpen.IsSelected = false;
- //btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
+ btnCurtainOpen.IsSelected = false;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = true;
curtain.trait_on_off.curValue = "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.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- btnCurtainOpen.IsSelected = false;
- //btnCurtainClose.IsSelected = false;
- //btnCurtainStop.IsSelected = false;
+ btnCurtainOpen.IsSelected = true;
+ btnCurtainClose.IsSelected = false;
+ btnCurtainStop.IsSelected = false;
+ btnCurtainBgIcon.IsSelected = true;
curtain.trait_on_off.curValue = "on";
- //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.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
--
Gitblit v1.8.0