From 8d5dc03b988ac479b29ff3bb747bd1e61bf8b1ab Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 17:06:28 +0800
Subject: [PATCH] 20201210

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 4504b63..c95e0f6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -14,12 +14,12 @@
         Scene scene;
 
         Action refreshAction;
-        Function function;
-        public SceneFunctionInfoEditPage(Scene s,Function fc,Action action)
+        SceneFunction sceneFunction;
+        public SceneFunctionInfoEditPage(Scene s, SceneFunction fc,Action action)
         {
             bodyView = this;
             scene = s;
-            function = fc;
+            sceneFunction = fc;
             refreshAction = action;
         }
 
@@ -28,7 +28,7 @@
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
-            new TopViewDiv(bodyView, function.name).LoadTopView();
+            new TopViewDiv(bodyView, sceneFunction.localFunction.name).LoadTopView();
 
             contentView = new VerticalScrolViewLayout()
             {
@@ -39,32 +39,32 @@
             bodyView.AddChidren(contentView);
 
             //鍔犺浇寮�鍏砇ow
-            LoadFunctionRow(function.trait_on_off);
+            LoadFunctionRow(sceneFunction.localFunction.trait_on_off);
 
-            switch (function.functionType)
+            switch (sceneFunction.localFunction.functionType)
             {
                 case FunctionType.AC:
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "set_temperature"));
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "mode"));
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "fan"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "fan"));
                     break;
                 case FunctionType.FloorHeating:
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "set_temperature"));
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "mode"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
                     break;
                 case FunctionType.Curtain:
                     //鏃犳搷浣�
                     break;
                 case FunctionType.MotorCurtain:
                 case FunctionType.RollingShutter:
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "percent"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent"));
                     break;
                 case FunctionType.Relay:
                     //鏃犳搷浣�
                     break;
                 case FunctionType.Dimmer:
                 case FunctionType.RGB:
-                    LoadFunctionRow(function.function.Find((obj) => obj.key == "brightness"));
+                    LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness"));
                     break;
             }
 
@@ -98,14 +98,14 @@
 
             btnConfrim.MouseUpEventHandler = (sender, e) =>
             {
-                var temp = scene.sceneFunctionList.Find((obj) => obj.sid == function.sid);
-                if (temp!=null)
+                var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
+                if (temp != null)
                 {
-                    temp = function;
+                    temp = sceneFunction;
                 }
                 else
                 {
-                    scene.sceneFunctionList.Add(function);
+                    scene.functions.Add(sceneFunction);
                 }
                 refreshAction();
                 this.RemoveFromParent();
@@ -266,7 +266,7 @@
 
 
             btnSceneDelayTitle.MouseUpEventHandler = (sender, e) => {
-                new PublicAssmebly().SetSceneDelayDialog(function, btnDelayInfo);
+                new PublicAssmebly().SetSceneDelayDialog(scene, btnDelayInfo);
             };
 
 
@@ -320,7 +320,7 @@
                 SelectedTextColor = CSS_Color.MainColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextID = StringId.On,
-                IsSelected = function.trait_on_off.curValue.ToString() == "on"
+                IsSelected = trait.curValue.ToString() == "on"
             };
             optionView.AddChidren(btnOn);
 
@@ -334,7 +334,7 @@
                 SelectedTextColor = CSS_Color.MainColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextID = StringId.OFF,
-                IsSelected = function.trait_on_off.curValue.ToString() == "off"
+                IsSelected = trait.curValue.ToString() == "off"
             };
             optionView.AddChidren(btnOff);
 

--
Gitblit v1.8.0