1

wei

2021-08-27 c9dd765615b4bc6577ad39a9d6abcf33c735e685

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -504,6 +504,17 @@
                            }
                        }
                        break;
                    case "10":
                        {
                            //用sid找到场景；
                            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":
                        {
                            //用sid找到安防；
                            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,