From 8677d9602ffa36554b2f0923f978bd3c054a905d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 16:15:34 +0800
Subject: [PATCH] 2020-12-21 1.功能介绍接口对接

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index f333a9b..bb1153b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -521,6 +521,7 @@
                     Tag = item + "_View",
                     Y = index % 2 == 1 ? lastY2 : lastY1
                 };
+                MainPage.Log($"Load FunctionView Tag = {item}");
                 //楂樺害绋嶉珮鐨剉iew
                 if (specialList.Contains(index))
                 {
@@ -589,7 +590,7 @@
 
                         btnLightPower.MouseUpEventHandler = (sender, e) =>
                         {
-                            LoadEvent_SwitchFunction(btnLightPower, item);
+                            LoadEvent_SwitchFunction(btnLightPower, item, functionView);
                         };
                         functionPageTitleId = StringId.Lights;
                       
@@ -614,7 +615,7 @@
                         functionView.AddChidren(btnAcPower);
                         btnAcPower.MouseUpEventHandler = (sender, e) =>
                         {
-                            LoadEvent_SwitchFunction(btnAcPower, item);
+                            LoadEvent_SwitchFunction(btnAcPower, item, functionView);
                         };
                         functionPageTitleId = StringId.AC;
                         #endregion
@@ -633,7 +634,6 @@
                             Height = Application.GetRealWidth(32),
                             UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
                             SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
-                            //Tag = item + "_AllControl",
                             IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
                         };
                         functionView.AddChidren(btnClose);
@@ -650,7 +650,7 @@
                             IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
                         };
                         functionView.AddChidren(btnOpen);
-                        LoadEvent_CurtainSwitch(btnClose, btnOpen);
+                        LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);
 
                         functionPageTitleId = StringId.Curtain;
                         #endregion
@@ -674,7 +674,7 @@
                         functionView.AddChidren(btnFhPower);
                         btnFhPower.MouseUpEventHandler = (sender, e) =>
                         {
-                            LoadEvent_SwitchFunction(btnFhPower, item);
+                            LoadEvent_SwitchFunction(btnFhPower, item, functionView);
                         };
                         functionPageTitleId = StringId.FloorHeating;
                         #endregion
@@ -701,7 +701,7 @@
                         functionView.AddChidren(btnElectricPower);
                         btnElectricPower.MouseUpEventHandler = (sender, e) =>
                         {
-                            LoadEvent_SwitchFunction(btnElectricPower, item);
+                            LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
                         };
                         functionPageTitleId = StringId.Electric;
                         #endregion

--
Gitblit v1.8.0