From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
index a10824a..e1706e6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
@@ -149,17 +149,17 @@
};
bodyView.AddChidren(sceneListView);
- foreach (var function in DB_ResidenceData.functionList.scenes)
+ foreach (var function in FunctionList.List.scenes)
{
- var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
- if (sbkScene != null)
- {
- addedList.Add(function);
- }
- else
- {
- notAddedList.Add(function);
- }
+ //var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
+ //if (sbkScene != null)
+ //{
+ // addedList.Add(function);
+ //}
+ //else
+ //{
+ // notAddedList.Add(function);
+ //}
}
foreach (var ddd in sbk_Devcie.number)
{
--
Gitblit v1.8.0