From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

---
 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 271b160..d5bea34 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -207,6 +207,10 @@
             {
                 functionList.AddRange(FunctionList.List.GetIpCamImouList());
             }
+            else if(titleId == StringId.EnergyMonitoring)
+            {
+                functionList.AddRange(FunctionList.List.GetEnergyList());
+            }
             functionList = functionList.OrderByDescending(o => o.controlCounter).ToList();
 
             ShowFunctionRow(functionList);
@@ -271,7 +275,7 @@
                             {
                                 continue;
                             }
-                            if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+                            if (function.spk == SPK.LightCCT || function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                             {
                                 var functionDiv = new FunctionControlZone(function,null)
                                 {
@@ -305,9 +309,37 @@
                                 functionListView.AddChidren(functionDiv);
 
                             }
+                            else if (function.spk == SPK.ElectricalTvHisense)
+                            {
+                                Action deviceDelAction = () =>
+                                {
+                                    //鍒犻櫎璁惧鎴愬姛鍚庢洿鏂癠I
+                                    if (functionListView==null) {
+                                        return;
+                                    }
+                                    functionListView.RemoveAll();
+                                    showList.Remove(function);//鍏堢Щ闄�
+                                    ShowFunctionRow(showList,isAppend);
+
+                                };
+                                var functionDiv = new FunctionControlZone(function, deviceDelAction) 
+                                {
+                                    Gravity = Gravity.CenterHorizontal,
+                                    Width = Application.GetRealWidth(343),
+                                    Height = Application.GetRealHeight(96),
+                                    Radius = (uint)Application.GetMinRealAverage(12),
+                                    BorderColor = 0x00FFFFFF,
+                                    BorderWidth = 1,
+                                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                                    Tag = function.spk + function.sid
+                                };
+                                functionDiv.LoadFunctionDiv();
+                                functionDiv.OrderEvent = OrderEvent;
+                                functionListView.AddChidren(functionDiv);
+                            }
                             else
                             {
-                                var functionDiv = new FunctionControlZone(function,null)
+                                var functionDiv = new FunctionControlZone(function, null)
                                 {
                                     Gravity = Gravity.CenterHorizontal,
                                     Width = Application.GetRealWidth(343),

--
Gitblit v1.8.0