From f982455916297ab07379d902a7f15b7a7a867c94 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 20 十月 2021 09:19:20 +0800
Subject: [PATCH] 1

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 4a53bf1..eb0e4eb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -13,6 +13,10 @@
             Tag = "Logic";
         }
         /// <summary>
+        /// 褰撳墠閫変腑鐨勫姛鑳�
+        /// </summary>
+        private Entity.Function function = null;
+        /// <summary>
         /// 瀹氫箟涓�涓褰曢�変腑璁惧鐘舵�佸垪琛紱
         /// </summary>
         private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -23,6 +27,7 @@
 
         public void Show(Entity.Function device, int index, bool edit)
         {
+            this.function = device;
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
             LogicView.TopView topView = new LogicView.TopView();
@@ -54,10 +59,13 @@
                 case SPK.CurtainTrietex:
                 //绌鸿皟
                 case SPK.AcStandard:
+                case SPK.HvacAC:
                 //鍦扮儹
                 case SPK.FloorHeatStandard:
+                case SPK.HvacFloorHeat:
                 //鏂伴
                 case SPK.AirFreshStandard:
+                case SPK.HvacAirFresh:
                     {
 
                         LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -110,6 +118,7 @@
                     break;
                 //骞叉帴鐐�
                 case SPK.SensorDryContact:
+                case SPK.SensorDryContact2:
                     {
                         LogicView.FunTypeView view = new LogicView.FunTypeView();
                         view.btnText.TextID = StringId.switchLogic;
@@ -189,6 +198,7 @@
                     break;
                 //姣背娉紶鎰熷櫒
                 case SPK.SenesorMegahealth:
+                case SPK.SenesorMegahealth2:
                     {
                         LogicView.FunTypeView view = new LogicView.FunTypeView();
                         view.btnText.TextID = StringId.mubiaozhuangtai;//鐩爣鐘舵��
@@ -464,22 +474,48 @@
                 switch (device.spk)
                 {
                     //浼犳劅鍣�
+                    case SPK.SensorGas:
                     case SPK.SensorWater:
                     case SPK.SensorSmoke:
-                    case SPK.SensorGas:
-                    case SPK.SensorDryContact:
-                    case SPK.SensorShanLan:
-                    case SPK.SensorDuiShe:
-                    case SPK.SensorPir:
+                        {
+                            keyVlaue = "status";
+                            if (!Is_SpkAttribute(keyVlaue)) {
+                                keyVlaue = "alarm_status";
+                            } 
+                        };
+                        break;
                     case SPK.SensorDoorWindow:
+                    case SPK.SensorDryContact:
+                    case SPK.SensorDryContact2:
+                        {
+                            keyVlaue = "status";
+                            if (!Is_SpkAttribute(keyVlaue))
+                            {
+                                keyVlaue = "contact_status";
+                            }
+                        }
+                        break;
+                    case SPK.SensorDuiShe:
+                    case SPK.SensorShanLan:
+                    case SPK.SensorPir:
                     case SPK.SensorUtrasonic:
                         {
                             keyVlaue = "status";
+                            if (!Is_SpkAttribute(keyVlaue))
+                            {
+                                keyVlaue = "people_status";
+                            }
+
                         }
                         break;
                     case SPK.SenesorMegahealth:
+                    case SPK.SenesorMegahealth2:
                         {
                             keyVlaue = "action_state";
+                            if (!Is_SpkAttribute(keyVlaue))
+                            {
+                                keyVlaue = "megahealth_state";
+                            }
                         }
                         break;
 
@@ -515,7 +551,7 @@
                         break;
                     case StringId.wuren:
                         {
-                            if (device.spk == SPK.SenesorMegahealth)
+                            if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SenesorMegahealth2)
                             {
                                 value = "uninhabited";
                             }
@@ -653,8 +689,10 @@
                        case SPK.SensorTVOC:
                        case SPK.SensorHcho:
                            {
-                               ///鍏徃浼犳劅鍣╧ey鐨勫仴鍊兼槸鈥渧alue鈥濓紱
-                               key = "value";
+                               if (!Is_SpkAttribute(key))
+                               {
+                                   key = "value";
+                               }
                            }
                            break;
                    }
@@ -804,6 +842,21 @@
             return false;
         }
 
+        /// <summary>
+        /// 璇嗗埆浣跨敤鍔熻兘鏄惁瀛樺湪灞炴��
+        /// </summary>
+        /// <param name="key">璁惧灞炴�э紝浜戦泙涓婂畾涔夊ソ鐨�</param>
+        /// <returns></returns>
+        private bool Is_SpkAttribute(string key) {
+            ///淇敼鏂板睘鎬�
+            ///璇嗗埆浣跨敤鍔熻兘鏄惁瀛樺湪灞炴��
+            var job = this.function.GetAttribute(key);
+            if (job != null)
+            {
+                return true;
+            }
+            return false;
+        }
        
     }
 }

--
Gitblit v1.8.0