From c9dd765615b4bc6577ad39a9d6abcf33c735e685 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:19 +0800
Subject: [PATCH] 1

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

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 398c19a..8091f6f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -504,6 +504,17 @@
                             }
                         }
                         break;
+                    case "10":
+                        {
+                            //鐢╯id鎵惧埌鍦烘櫙锛�
+                            var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
+                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
+                            inputView.btnNextIcon.Visible = false;
+                            inputView.btnClick.Visible = false;
+                            //鏄剧ず鍦烘櫙鍚嶇О
+                            inputView.btnText.Text = scene.name;
+                        }
+                        break;
 
                 }
                 //鍐嶆缂栬緫鏉′欢鐘舵�佺偣鍑讳簨浠�
@@ -755,6 +766,7 @@
                                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                             }
                             break;
+                     
                     }
                 };
                 ///鍒犻櫎鎺т欢
@@ -1088,6 +1100,27 @@
                         break;
                     case "3":
                         {
+                            //鐢╯id鎵惧埌瀹夐槻锛�
+                            var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
+                            targetView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
+                            targetView.btnDelay.Visible = false;
+                            //鏄剧ず瀹夐槻鍚嶇О 
+                            targetView.btnText.Text = security.name;
+                            string value = GetKeyValue("security", dicList);
+                            if (value == "enable")
+                            {
+                                stateStr = Language.StringByID(StringId.bufang);
+
+                            }
+                            else
+                            {
+                                stateStr = Language.StringByID(StringId.chefang);
+                            }
+
+                        }
+                        break;
+                    case "4":
+                        {
                             targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
                             foreach (var dic in dicList)
                             {
@@ -1098,9 +1131,9 @@
                         break;
                 }
 
-                if (outputTarget.target_type == "1")
+                if (outputTarget.target_type == "1" || outputTarget.target_type == "3")
                 {
-                    targetView.btnState.Text =new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
+                    targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
                 }
                 else
                 {
@@ -1139,7 +1172,12 @@
                             break;
                         case "3":
                             {
-
+                                Security security = new Security();
+                                security.SecurityMethod(thisView, "", edit, indexVulae);
+                            }
+                            break;
+                        case "4":
+                            {
                                 FrameLayout fLayout = new FrameLayout
                                 {
                                     BackgroundColor = CSS.CSS_Color.viewTrans60lucence,

--
Gitblit v1.8.0