From b271bcceb1c4e718377ca86b6213816abcf7482a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 13:57:18 +0800
Subject: [PATCH] 20210111-删除功能类别，统一使用spk去设备功能
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 584052a..8c27dc8 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -16,7 +16,7 @@
/// <param name="updataFunction"></param>
public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
@@ -53,10 +53,11 @@
if (fcView.GetChildren(j).Tag == null)
continue;
var cTag = fcView.GetChildren(j).Tag.ToString();
- switch (updataFunction.functionCategory)
+ switch (updataFunction.Spk_Prefix)
{
case FunctionCategory.Light:
- case FunctionCategory.Thermostat:
+ case FunctionCategory.AC:
+ case FunctionCategory.FloorHeat:
#region 鎸夐挳鐘舵�佹洿鏂�
if (cTag == updataFunction.sid + "_Switch")
{
@@ -93,7 +94,7 @@
}
#endregion
#region 鍔熻兘鐘舵�佷俊鎭洿鏂�
- else if (cTag == updataFunction.functionType + "_laststates_" + updataFunction.sid)
+ else if (cTag == updataFunction.spk + "_laststates_" + updataFunction.sid)
{
try
{
@@ -160,7 +161,7 @@
case FunctionCategory.Music:
#region 闊充箰鏇存柊
var uMusic = updataFunction as Music.A31MusicModel;
- if (cTag == updataFunction.functionType + "_State_" + updataFunction.sid)
+ if (cTag == updataFunction.spk + "_State_" + updataFunction.sid)
{
try
{
@@ -183,7 +184,7 @@
{
MainPage.Log($"RoomControlZone Updata States error : {ex.Message}");
}
- });
+ }));
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0