Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

wxr

2023-11-07 e06be53dff56744de8db2a2aec136d494cc187bf

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

@@ -504,6 +504,17 @@
                                        {
                                            int time = int.Parse(inputCondition.hold_time);
                                            inputView.btnState.Text += "持续" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
                                        }
                                        if (!string.IsNullOrEmpty(inputCondition.detect_type))
                                        {
                                            if (inputCondition.detect_type == "1")
                                            {
                                                inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing);
                                            }
                                            else
                                            {
                                                inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing);
                                            }
                                        }