From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6

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

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index ddafe50..386cc78 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;
         }
@@ -343,6 +343,7 @@
             ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
             aaao.deviceId = this.deviceId;
             aaao.spk = this.spk;
+            aaao.bus = this.bus;
             foreach (var kv in keyValues)
             {
                 aaao.attributes.Add(new AlinkControlAttributes()

--
Gitblit v1.8.0