From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111

---
 HDL_ON/Entity/Function/Function.cs |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index d6d1e9b..386cc78 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -119,7 +119,7 @@
         /// bus鍗忚鏁版嵁鏍煎紡
         /// 浣跨敤A鍗忚鎺у埗鏃讹紝鏀瑰睘鎬т负绌�
         /// </summary>
-        public BusData bus_Data;
+        public BusData bus;
         /// <summary>
         /// 鏄惁鏀惰棌
         /// </summary>
@@ -173,8 +173,8 @@
                             max = 1,
                             min = 0,
                         };
+                        _trait_on_off.curValue = "on";
                     }
-                    _trait_on_off.curValue = "on";
                 }
                 return _trait_on_off;
             }
@@ -206,9 +206,9 @@
         public string GetBusId()
         {
             string busId = "";
-            if (bus_Data != null)
+            if (bus != null)
             {
-                busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.loopId;
+                busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.LoopId;
             }
             return busId;
         }
@@ -235,7 +235,7 @@
             }
             if (roomNameList == "" && functionType == FunctionType.Scene)
             {
-                roomNameList = Language.StringByID(StringId.WholeHouseScene);
+                roomNameList = Language.StringByID(StringId.WholeZone);
             }
             return roomNameList;
         }
@@ -286,9 +286,14 @@
             var sFunc = new SceneFunction();
             foreach (var attr in attributes)
             {
+                if (attr.curValue.ToString() == "{}")
+                {
+                    attr.curValue = "0";
+                }
                 if (attr.key == FunctionAttributeKey.SetTemp)
                 {
-                    var vv = Convert.ToDouble(attr.value);
+                    double vv = 16;
+                    Double.TryParse(attr.curValue.ToString(),out vv);
                     sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
                 }
                 else
@@ -317,9 +322,9 @@
 
             var acd = new AlinkControlData();
             acd.sid = sid;
-            var aca = new AlinkControlAttributes();
             foreach (var dic in commandDictionary)
             {
+                var aca = new AlinkControlAttributes();
                 aca.key = dic.Key;
                 aca.value = dic.Value;
                 acd.status.Add(aca);
@@ -338,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()
@@ -420,6 +426,7 @@
     /// 鍔熻兘灞炴��
     /// 灞炴�у瓧娈佃В鏋愶細attri :灞炴�у唴瀹癸紝value 灞炴�х殑鍊硷紝max 鏈�澶у�� min 鏈�灏忓��
     /// </summary>
+    [System.Serializable]
     public class FunctionAttributes
     {
         /// <summary>
@@ -533,7 +540,15 @@
                 return Convert.ToByte(addresses.Substring(2, 2), 16);
             }
         }
-        public byte loopId;
+        public byte LoopId
+        {
+            get
+            {
+                return Convert.ToByte(loopId, 16);
+            }
+        }
+
+        public string loopId;
     }
 
     public static class SPK

--
Gitblit v1.8.0