2023年11月06日11:23:46

mac

2023-11-06 54c202bd4867092fca2bc6f96bec0cfd1056a46a

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

@@ -218,9 +218,9 @@
                                case SPK.SensorDryContact2:
                                    {

                                        string value = this.GetKeyValue("on_off", dicList);
                                        string value = this.GetKeyValue("contact_status", dicList);
                                        inputView.btnState.Text = Language.StringByID(StringId.offLogic);
                                        if (value == "on")
                                        if (value == "open")
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.onLogic);
                                        }
@@ -473,7 +473,7 @@
                                    }
                                    break;
                                case SPK.Ev_Ipcam:
                                    if (inputCondition.identifier == "motiondetect_event")
                                    if (inputCondition.identifier == Constant.intelligentDetection_event)
                                    {
                                        inputView.btnState.Text = Language.StringByID(StringId.shi);
                                    }
@@ -489,7 +489,7 @@
                                        string value = this.GetKeyValue("people_status", dicList);
                                        if (string.IsNullOrEmpty(value))
                                        {
                                            inputView.btnState.Text = inputCondition.hold_time + "s";
                                            inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
                                            break;

                                        }
@@ -502,8 +502,19 @@
                                        }
                                        if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
                                        {

                                            inputView.btnState.Text += "持续" + inputCondition.hold_time + "s";
                                            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);
                                            }
                                        }


@@ -1055,6 +1066,7 @@
                                        }
                                    }
                                    break;
                                case SPK.OtherCommon:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
@@ -1715,6 +1727,7 @@
                    break;
                case SPK.ElectricSocket:
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //机械手
@@ -2290,7 +2303,7 @@
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "on")
                            if (value == "on"|| value == "open")
                            {
                                button1.Text = Language.StringByID(StringId.onLogic);
                            }
@@ -2891,29 +2904,30 @@
            string state = "";
            var minutes = timeValue / 60;
            var seconds = timeValue % 60;
            if (minutes != 0)
            {
                if (seconds == 0)
                {
                    state = minutes.ToString() + Language.StringByID(StringId.minute);
                }
                else
                {
                    state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
                }
            }
            else
            {
                if (seconds != 0)
                {
                    state = seconds.ToString() + Language.StringByID(StringId.s);
                }
            }
            if (!string.IsNullOrEmpty(state))
            {
                state = Language.StringByID(StringId.delayLogic) + state;
            }
            return state;
            return LogicMethod.Current.getTimeStr(strTimeValue).Replace("0s","");
            //if (minutes != 0)
            //{
            //    if (seconds == 0)
            //    {
            //        state = minutes.ToString() + Language.StringByID(StringId.minute);
            //    }
            //    else
            //    {
            //        state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
            //    }
            //}
            //else
            //{
            //    if (seconds != 0)
            //    {
            //        state = seconds.ToString() + Language.StringByID(StringId.s);
            //    }
            //}
            //if (!string.IsNullOrEmpty(state))
            //{
            //    state = Language.StringByID(StringId.delayLogic) + state;
            //}
            //return state;
        }
        /// <summary>
        /// 获取显示面熟文本