From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新

---
 HDL_ON/Entity/Function/FloorHeating.cs |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index 3cf3d09..a3af174 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/HDL_ON/Entity/Function/FloorHeating.cs
@@ -48,30 +48,30 @@
                 }
             }
         }
-        Trait _trait_mode;
+        FunctionAttributes _trait_mode;
         /// <summary>
         /// 妯″紡灞炴��
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
-        public Trait trait_mode
+        public FunctionAttributes trait_mode
         {
             get
             {
                 if (_trait_mode == null)
                 {
-                    _trait_mode = function.Find((obj) => obj.name == "mode");
+                    _trait_mode = function.Find((obj) => obj.key == "mode");
                     //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
                     if (_trait_mode == null)
                     {
-                        _trait_mode = new Trait()
+                        _trait_mode = new FunctionAttributes()
                         {
-                            name = "mode",
-                            value_key = new List<string> { "day", "night", "away", "normal", "timer" },
+                            key = "mode",
+                            value = new List<string> { "day", "night", "away", "normal", "timer" },
                             max = 4,
                             min = 0,
                         };
                     }
-                    _trait_mode.value = _trait_mode.value_key.Count > 0 ? _trait_mode.value_key[0] : "";
+                    _trait_mode.curValue = _trait_mode.value.Count > 0 ? _trait_mode.value[0] : "";
                 }
                 return _trait_mode;
             }
@@ -95,7 +95,7 @@
                 try
                 {
                     byte index = 0;
-                    switch (trait_mode.value.ToString())
+                    switch (trait_mode.curValue.ToString())
                     {
                         case "day":
                             index = 2;
@@ -129,22 +129,22 @@
                 switch (value)
                 {
                     case 5:
-                        trait_mode.value = "timer";
+                        trait_mode.curValue = "timer";
                         break;
                     case 1:
-                        trait_mode.value = "normal";
+                        trait_mode.curValue = "normal";
                         break;
                     case 2:
-                        trait_mode.value = "day";
+                        trait_mode.curValue = "day";
                         break;
                     case 3:
-                        trait_mode.value = "night";
+                        trait_mode.curValue = "night";
                         break;
                     case 4:
-                        trait_mode.value = "away";
+                        trait_mode.curValue = "away";
                         break;
                     default:
-                        trait_mode.value = "cool";
+                        trait_mode.curValue = "cool";
                         break;
 
                 }
@@ -164,32 +164,32 @@
         public int indoorTemp = 20;
 
 
-        Trait _trait_temp;
+        FunctionAttributes _trait_temp;
         /// <summary>
         /// 褰撳墠娓╁害
         /// </summary>/// <summary>
         /// 褰撳墠绌鸿皟娓╁害
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
-        public Trait trait_temp
+        public FunctionAttributes trait_temp
         {
             get
             {
                 if (_trait_temp == null)
                 {
-                    _trait_temp = function.Find((obj) => obj.name == "set_temperature");
+                    _trait_temp = function.Find((obj) => obj.key == "set_temperature");
                     //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
                     if (_trait_temp == null)
                     {
-                        _trait_temp = new Trait()
+                        _trait_temp = new FunctionAttributes()
                         {
-                            name = "set_temperature",
-                            value_key = new List<string> { },
+                            key = "set_temperature",
+                            value = new List<string> { },
                             max = 30,
                             min = 5,
                         };
                     }
-                    _trait_temp.value = 16;
+                    _trait_temp.curValue = 16;
                 }
                 return _trait_temp;
             }
@@ -205,7 +205,7 @@
                 try
                 {
                     var imagePath = "FunctionIcon/AC/HeatingIcon.png";
-                    switch (trait_mode.value)
+                    switch (trait_mode.curValue)
                     {
                         case "day":
                             imagePath = "FunctionIcon/AC/HeatingIcon.png";

--
Gitblit v1.8.0