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/ConditionDeviceFunList.cs

@@ -3,7 +3,6 @@
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;


namespace HDL_ON.UI.UI2.Intelligence.Automation
@@ -42,8 +41,12 @@
        /// 人体传感器持续时间专用
        /// </summary>
        private string hold_time=string.Empty;
        /// <summary>
        /// 检测类型 配合condition_type=3时使用,没有该字段、该值或0: 状态检测(每次收到状态就成立),1:动作检测(需要切换状态才成立)
        /// </summary>
        private string detect_type = "0";

        


        private static ConditionDeviceFunList m_Current = null;

@@ -199,7 +202,7 @@
                //人体存在传感器
                case SPK.SensorPirHold:
                    {
                       


                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.TextID = StringId.rentijiance;
@@ -227,6 +230,31 @@

                        };

                        LogicView.FunTypeView view3 = new LogicView.FunTypeView();
                        view3.frameLayout.Y = view2.frameLayout.Bottom;
                        view3.btnText.TextID = StringId.zhixingmoshi;
                        view3.btnState.TextID = StringId.shoudaojiuzhixing;
                        fLayout.AddChidren(view3.FLayoutView());
                        view3.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
                            this.AddChidren(frame);
                            LogicView.SwitchView switchView = new LogicView.SwitchView();
                            switchView.FLayoutView(frame, StringId.gaibiancaizhixing, StringId.shoudaojiuzhixing, view3.btnState.Text, 2, (intValue) =>
                            {
                                if (StringId.gaibiancaizhixing == intValue)
                                {
                                    this.detect_type = "1";
                                }
                                else
                                {
                                    this.detect_type = "0";
                                }
                                view3.btnState.TextID = intValue;
                                selectedState = device.spk + "_" + this.detect_type;
                            });
                        };


                        if (edit)
                        {
@@ -239,9 +267,21 @@
                                    int h = time / (60 * 60);
                                    int m = time % (60 * 60) / 60;
                                    int s = (time % (60 * 60) % 60);
                                    view2.btnState.Text = LogicMethod.Current.getTimeStr(inputs.hold_time); 
                                    view2.btnState.Text = LogicMethod.Current.getTimeStr(inputs.hold_time);
                                    view2.btnState.Name = h + ":" + m + ":" + s;
                                    this.hold_time = inputs.hold_time;
                                }
                                if (!string.IsNullOrEmpty(inputs.detect_type))
                                {
                                    this.detect_type = inputs.detect_type;
                                    if (inputs.detect_type == "1")
                                    {
                                        view3.btnState.TextID = StringId.gaibiancaizhixing;
                                    }
                                    else
                                    {
                                        view3.btnState.TextID = StringId.shoudaojiuzhixing;
                                    }
                                }
                            }
                            catch { }
@@ -843,6 +883,7 @@
                {
                    //人体存在传感器
                    inputDevice.hold_time = this.hold_time;
                    inputDevice.detect_type = this.detect_type;
                }