From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index ae6c83a..2a295ff 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -281,6 +281,7 @@
                                     }
                                     break;
                                 case SPK.SenesorMegahealth:
+                                case SPK.SensorMmvPose:
                                     {
                                         string key = this.GetKey(dicList);
                                         string value = this.GetValue(dicList);
@@ -970,6 +971,14 @@
                                         {
                                             stateStr = brightness + "%";
                                         }
+                                        if (device.spk == SPK.LightCCT)
+                                        {
+                                            //鑹叉俯杩欎釜灞炴�ф墠鏈夋晥
+                                            if (stateStr != Language.StringByID(StringId.offLogic) && GetKeyValue("cct", dicList) != "")
+                                            {
+                                                stateStr += "," +GetKeyValue("cct", dicList) + "k";
+                                            }
+                                        }
 
                                     }
                                     break;
@@ -1487,6 +1496,16 @@
                                         button2.Text = value + "%";
                                     }
                                     break;
+                                case "cct":
+                                    {
+                                        if (button3 == null)
+                                        {
+                                            //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+                                            break;
+                                        }
+                                        button3.Text = value + "k";
+                                    }
+                                    break;
                             }
 
                         }
@@ -2002,6 +2021,7 @@
                     }
                     break;
                 case SPK.SenesorMegahealth:
+                case SPK.SensorMmvPose:
                     {
                         foreach (var dic in dicList)
                         {

--
Gitblit v1.8.0