From 068c68295cad1967f7aafb4e5e951260ef03d4ce Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 09:16:43 +0800
Subject: [PATCH] 状态属性更改，不要轻易合并
---
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 0087ce3..d37b3a4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -12,27 +12,27 @@
/// </summary>
public static void UpdataState(Function updataTemp)
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread((Action)(() => {
if(bodyView == null)
{
return;
}
if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
{
- if (updataTemp.trait_on_off.curValue.ToString() == "stop")
+ if (updataTemp.trait_on_off.state.ToString() == "stop")
{
//bodyView.btnCurtainOpen.IsSelected = false;
//bodyView.btnCurtainClose.IsSelected = false;
//bodyView.btnCurtainStop.IsSelected = true;
}
- else if (updataTemp.trait_on_off.curValue.ToString() == "on")
+ else if (updataTemp.trait_on_off.state.ToString() == "on")
{
//bodyView.btnCurtainOpen.IsSelected = true;
//bodyView.btnCurtainClose.IsSelected = false;
//bodyView.btnCurtainStop.IsSelected = false;
bodyView.btnCurtainBgIcon.IsSelected = true;
}
- else if (updataTemp.trait_on_off.curValue.ToString() == "off")
+ else if (updataTemp.trait_on_off.state.ToString() == "off")
{
//bodyView.btnCurtainOpen.IsSelected = false;
//bodyView.btnCurtainClose.IsSelected = true;
@@ -40,7 +40,7 @@
bodyView.btnCurtainBgIcon.IsSelected = false;
}
}
- });
+ }));
}
void LoadEventList()
@@ -79,9 +79,9 @@
});
}) { IsBackground = true }.Start();
btnCurtainBgIcon.IsSelected = false;
- function.trait_on_off.curValue = "off";
+ function.trait_on_off.state = "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.curValue.ToString());
+ d.Add("on_off", function.trait_on_off.state.ToString());
Control.Ins.SendWriteCommand(function, d);
};
@@ -106,9 +106,9 @@
});
})
{ IsBackground = true }.Start();
- function.trait_on_off.curValue = "stop";
+ function.trait_on_off.state = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.curValue.ToString());
+ d.Add("on_off", function.trait_on_off.state.ToString());
Control.Ins.SendWriteCommand(function, d);
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
@@ -121,9 +121,9 @@
})
{ IsBackground = true }.Start();
btnCurtainBgIcon.IsSelected = true;
- function.trait_on_off.curValue = "on";
+ function.trait_on_off.state = "on";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.curValue.ToString());
+ d.Add("on_off", function.trait_on_off.state.ToString());
Control.Ins.SendWriteCommand(function, d);
};
--
Gitblit v1.8.0