From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
index 4df4dd8..5f4966d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -138,6 +138,15 @@
{
continue;
}
+ //濡傛灉鍦烘櫙鏄伅鍏夊満鏅紝鍙兘鍔犺浇鐏厜鍔熻兘
+ if (scene.sceneType == SceneType.LightScene)
+ {
+ if (!SPK.LightSpkList().Contains(function.spk))
+ {
+ continue;
+ }
+ }
+
function.roomIds.Remove(null);
if (scene.functions.Find((obj) => obj.sid == function.sid) != null)
{
@@ -157,7 +166,6 @@
/// <summary>
/// 鏄剧ず鍔熻兘Row
/// </summary>
- /// <param name="showUnallocated">鏄惁鏄樉绀烘湭鍒嗛厤</param>
void LoadFunctionListRow(List<Function> functions)
{
functionListView.RemoveAll();
@@ -170,11 +178,7 @@
}
foreach (var function in functions)
{
- if (function.Spk_Prefix != FunctionCategory.Light &&
- function.Spk_Prefix != FunctionCategory.AC &&
- function.Spk_Prefix != FunctionCategory.FloorHeat &&
- function.Spk_Prefix != FunctionCategory.Curtain
- )
+ if (!MainPage.SceneSupportFunctionList.Contains(function.spk))
{
continue;
}
--
Gitblit v1.8.0