From ed1c010c40e9324318171edefec5e9dbf46474a4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 18:01:09 +0800
Subject: [PATCH] 20201218-4

---
 HDL_ON/Entity/Function/Function.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 2fd3da8..3696447 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,8 +173,8 @@
                             max = 1,
                             min = 0,
                         };
+                        _trait_on_off.curValue = "on";
                     }
-                    _trait_on_off.curValue = "on";
                 }
                 return _trait_on_off;
             }
@@ -235,7 +235,7 @@
             }
             if (roomNameList == "" && functionType == FunctionType.Scene)
             {
-                roomNameList = Language.StringByID(StringId.WholeHouseScene);
+                roomNameList = Language.StringByID(StringId.WholeZone);
             }
             return roomNameList;
         }
@@ -643,15 +643,15 @@
         /// <summary>
         /// 瀹剁數銆佹彃搴�
         /// </summary>
-        public const string ElectricSocket = "electric.socket ";
+        public const string ElectricSocket = "electrical.socket";
         /// <summary>
         /// 瀹剁數銆佺數瑙�
         /// </summary>
-        public const string ElectricTV = "electric.tv";
+        public const string ElectricTV = "electrical.tv";
         /// <summary>
         /// 瀹剁數銆侀鎵�
         /// </summary>
-        public const string ElectricFan = "electric.fan";
+        public const string ElectricFan = "electrical.fan";
     }
 
 }
\ No newline at end of file

--
Gitblit v1.8.0