备份

wxr

2022-05-26 f75a1ba69f5922cab8d2ab43f4447b74bd9b9ea9

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

@@ -176,6 +176,23 @@
                                    }
                                    break;
                                //传感器
                                case SPK.SensorHelp:
                                    {
                                        foreach (var dic in dicList)
                                        {
                                            string value = dic["value"];
                                            if (value == "alarm")
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.qiujiu);

                                            }
                                            else
                                            {
                                                inputView.btnState.Text = Language.StringByID(StringId.zhengchang);
                                            }
                                        }
                                    }
                                    break;
                                case SPK.SensorSmoke:
                                case SPK.SensorGas:
                                    {
@@ -939,6 +956,7 @@
                            targetView.btnText.Text = device.name;
                            //改变设备名称显示控件宽度
                            targetView.btnText.Width = Application.GetRealWidth(80);
                            targetView.btnDelay.Visible = false;
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
@@ -991,8 +1009,6 @@
                                    }
                                    break;
                                case SPK.CurtainSwitch:
                                case SPK.CurtainTrietex:
                                case SPK.CurtainRoller:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -1015,6 +1031,29 @@
                                                    }
                                                    break;
                                            }
                                        }
                                    }
                                    break;
                                case SPK.CurtainTrietex:
                                case SPK.CurtainRoller:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string percent = GetKeyValue("percent", dicList); 
                                        if (on_off == "on" && percent != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
                                        }
                                        else if (on_off == "on")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        else if (on_off == "off")
                                        {
                                            stateStr = Language.StringByID(StringId.offLogic);
                                        }
                                        else if (percent != "")
                                        {
                                            stateStr = percent + "%";
                                        }
                                    }
                                    break;
@@ -1361,7 +1400,7 @@
                {

                    InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
                    inpOrOutLogicMethod.Delayed(thisView, outputTarget, (value) =>
                    inpOrOutLogicMethod.Delayed(thisView, outputTarget.delay, (value) =>
                    {
                        outputTarget.delay = value.ToString();
                        if (outputTarget.target_type == "1")
@@ -1454,8 +1493,6 @@
                    }
                    break;
                case SPK.CurtainSwitch:
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1479,6 +1516,52 @@
                                    break;
                            }
                        }
                    }
                    break;
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "on_off":
                                    {
                                        switch (value)
                                        {
                                            case "on":
                                                {
                                                    button1.Text = Language.StringByID(StringId.onLogic);
                                                }
                                                break;
                                            case "off":
                                                {
                                                    button1.Text = Language.StringByID(StringId.offLogic);
                                                }
                                                break;
                                            case "stop":
                                                {
                                                    button1.Text = Language.StringByID(StringId.stop);
                                                }
                                                break;
                                        }
                                    }
                                    break;
                                case "percent":
                                    {
                                        if (button2 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value + "%";
                                    }
                                    break;
                            }

                        }
                        
                    }
                    break;
                case SPK.AcStandard:
@@ -1742,6 +1825,22 @@

                        }

                    }
                    break;
                case SPK.SensorHelp:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "alarm")
                            {
                                button1.Text = Language.StringByID(StringId.qiujiu);
                            }
                            else
                            {
                                button1.Text = Language.StringByID(StringId.zhengchang);
                            }
                        }
                    }
                    break;
                case SPK.SensorGas:
@@ -2092,10 +2191,10 @@
        /// <summary>
        /// 延时时间方法
        /// </summary>
        /// <param name="fLayout">在哪个界面显示</param>
        /// <param name="edit">（true=编辑；false=新建）</param>
        /// <param name="index">编辑条件的索引</param>
        private void Delayed(FrameLayout thisFLayout, Output output, Action<int> action)
        /// <param name="thisFLayout">在哪个界面显示</param>
        /// <param name="delay">当前延时时间</param>
        /// <param name="action">回调函数</param>
        public void Delayed(FrameLayout thisFLayout, string delay, Action<int> action)
        {
            FrameLayout fLayout = new FrameLayout
            {
@@ -2119,9 +2218,9 @@
            //定义一个局部变量记录选中时间
            int timepoint = 5;

            if (output.delay != "0")
            if (delay != "0")
            {
                int intValue = int.Parse(output.delay);
                int intValue = int.Parse(delay);
                var m = intValue / 60;
                var s = intValue % 60;

@@ -2137,8 +2236,8 @@
            //选中时间回调方法,时间变化一次回调一次
            timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
            {
                string minuet = timePointView.GethStringList0()[index1].Split(' ')[0];
                string second = timePointView.GetmStringList()[index2].Split(' ')[0];
                string minuet = timePointView.GetmStringList()[index1].Split(' ')[0];
                string second = timePointView.GetsStringList()[index2].Split(' ')[0];
                int minuetIntValue = int.Parse(minuet);
                int secondIntValue = int.Parse(second);
                timepoint = minuetIntValue * 60 + secondIntValue;
@@ -2146,11 +2245,11 @@
            //确定点击事件
            timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
            {
                if (timepoint == 0)
                {
                    //提示
                    return;
                }
                //if (timepoint == 0)
                //{
                //    //提示
                //    return;
                //}
                fLayout.RemoveFromParent();
                action(timepoint);
            };