From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch

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

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 300e667..82876da 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -111,12 +111,34 @@
         /// <returns></returns>
         public string GetAttrState(string key)
         {
+            //涓�绾ф煡璇eyValue鍊�
             var attrState = attributes.Find((s) => s.key == key.ToString());
-            if (attrState == null || string.IsNullOrEmpty(attrState.state))
+            if (attrState == null)
             {
                 return "0";
             }
+            if (string.IsNullOrEmpty(attrState.state))
+            {
+                //浜岀骇鏌ヨkeyValue鍊�
+                return GetOriginalState(key);
+            }
             return attrState.state;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍒濆鐘舵��
+        /// 榛樿鍊硷細0
+        /// </summary>
+        /// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param>
+        /// <returns></returns>
+        public string GetOriginalState(string key)
+        {
+            var originalState = status.Find((s) => s.key == key.ToString());
+            if (originalState == null || string.IsNullOrEmpty(originalState.value))
+            {
+                return "0";
+            }
+            return originalState.value;
         }
         /// <summary>
         /// 璁剧疆灞炴�х姸鎬�
@@ -556,6 +578,13 @@
                 SaveFunctionFile();
                 if (pack.Code == StateCode.SUCCESS)
                 {
+                    if (UI.RoomPage.bodyView != null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            UI.RoomPage.bodyView.ReLoadPage();
+                        });
+                    }
                 }
                 else
                 {
@@ -701,6 +730,20 @@
             sendDataObj.objects.Add(acd);
             return sendDataObj;
         }
+
+        public AlinkDoorlockObj GetGatewayAlinkDoorlockData(string userId,string extStr)
+        {
+            var sendDataObj = new AlinkDoorlockObj();
+            sendDataObj.id = Control.Ins.msg_id.ToString();
+            sendDataObj.time_stamp = Utlis.GetTimestamp();
+            var acd = new AlinkDoorlockStatus();
+            acd.sid = sid;
+            acd.user_id = extStr;
+            acd.ext_str = extStr;
+            sendDataObj.objects.Add(acd);
+            return sendDataObj;
+        }
+
         /// <summary>
         /// 鑾峰彇Api鎺у埗鏁版嵁
         /// </summary>
@@ -754,6 +797,24 @@
         public string time_stamp = "";
         public string id = "";
     }
+    /// <summary>
+    /// 闂ㄩ攣閫氳鏁版嵁
+    /// </summary>
+    public class AlinkDoorlockObj
+    {
+        public List<AlinkDoorlockStatus> objects = new List<AlinkDoorlockStatus>();
+        public string time_stamp = "";
+        public string id = "";
+    }
+
+    public class AlinkDoorlockStatus
+    {
+        public string sid;
+        public string user_id;
+        public string ext_str;
+    }
+
+
     /// <summary>
     /// 鏈湴鐘舵�佽鍙�
     /// A鍗忚鐘舵�佽鍙栨牸寮忓璞�
@@ -1210,6 +1271,10 @@
         /// 绌鸿皟
         /// </summary>
         public const string HvacAC = "hvac.ac";
+        /// <summary>
+        /// 姣涚粏绠＄┖璋�
+        /// </summary>
+        public const string HvacCac = "hvac.cac";
 
         /// <summary>
         /// 绌鸿皟spk鍒楄〃
@@ -1221,6 +1286,7 @@
             spkList.Add(AcStandard);
             spkList.Add(HvacAC);
             spkList.Add(AcIr);
+            spkList.Add(HvacCac);
             return spkList;
         }
         #endregion
@@ -1376,6 +1442,10 @@
         public const string SenesorMegahealth = "sensor.megahealth";
         public const string SenesorMegahealth2 = "sensor.megahealth.zg";
         /// <summary>
+        /// 绱ф�ュ懠鍙�
+        /// </summary>
+        public const string SensorHelp = "sensor.help";
+        /// <summary>
         /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
         /// </summary>
         /// <returns></returns>
@@ -1397,6 +1467,17 @@
             spkList.Add(SenesorMegahealth2);
             return spkList;
         }
+
+        /// <summary>
+        /// 闈㈡澘spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> PanelSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(SensorHelp);
+            return spkList;
+        }
         #endregion
 
         #region 鐜浼犳劅鍣�

--
Gitblit v1.8.0