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/3-Intelligence/Scene/SceneFunctionListChoosePage.cs |   59 ++++++++---------------------------------------------------
 1 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
old mode 100755
new mode 100644
index 0ad5aaf..05c2a9c
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -128,8 +128,12 @@
             };
             bodyView.AddChidren(functionListView);
 
-            foreach (var function in FunctionList.List.GetDeviceFunctionList())
+            foreach (var function in FunctionList.List.Functions)
             {
+                if (!MainPage.SceneSupportFunctionList.Contains(function.spk))
+                {
+                    continue;
+                }
                 if (function == null)
                 {
                     continue;
@@ -153,7 +157,6 @@
         /// <summary>
         /// 鏄剧ず鍔熻兘Row
         /// </summary>
-        /// <param name="showUnallocated">鏄惁鏄樉绀烘湭鍒嗛厤</param>
         void LoadFunctionListRow(List<Function> functions)
         {
             functionListView.RemoveAll();
@@ -166,10 +169,7 @@
             }
             foreach (var function in functions)
             {
-                if (function.functionCategory != FunctionCategory.Light &&
-                    function.functionCategory != FunctionCategory.Thermostat &&
-                    function.functionCategory != FunctionCategory.Curtain
-                    )
+                if (!MainPage.SceneSupportFunctionList.Contains(function.spk))
                 {
                     continue;
                 }
@@ -209,51 +209,8 @@
                     Height = Application.GetMinRealAverage(28),
                 };
                 functionRow.AddChidren(btnFunctionIcon);
-                switch (function.functionCategory)
-                {
-                    case FunctionCategory.Thermostat:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.AC:
-                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
-                                break;
-                            case FunctionType.FloorHeating:
-                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
-                                break;
-                        }
-                        break;
-                    case FunctionCategory.Curtain:
-                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
-                        break;
-                    case FunctionCategory.Light:
-                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
-                        break;
-                    case FunctionCategory.SwitchDevice:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.Socket:
-                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
-                                break;
-                        }
-                        break;
-                    case FunctionCategory.Electrical:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.Fan:
-                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
-                                break;
-                            case FunctionType.TV:
-                                btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
-                                break;
-                        }
-                        break;
-                    case FunctionCategory.Scene:
-                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
-                        break;
-                    case FunctionCategory.Music:
-                        btnFunctionIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
-                        break;
-                }
+
+                btnFunctionIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
 
                 var btnFunctionName = new Button()
                 {

--
Gitblit v1.8.0