2023年10月19日10:34:19

mac

2023-10-19 baca65d449433d73516660d849c112ed8f5d3dd3

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

@@ -265,6 +265,22 @@
                        }
                    }
                    break;
                //紧急呼叫传感器
                case SPK.SensorHelp:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView();
                        view.btnText.TextID = StringId.qiujiu;
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang,1);
                        };
                        if (edit)
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;
                //超声波传感器
                case SPK.SensorUtrasonic:
                    {
@@ -879,7 +895,7 @@
        /// <param name="button">选中状态显示文本Btn控件</param>
        /// <param name="btnText1">属性状态值文本1</param>
        /// <param name="btnText2">属性状态值文本2</param>
        /// <param name="viewCount">view数量</param>
        /// <param name="viewCount">view数量,默认2个view</param>
        private void DeviceView(Entity.Function device, Button button, int btnText1, int btnText2,int viewCount=2)
        {
            FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
@@ -896,6 +912,7 @@
                    case SPK.SensorGas:
                    case SPK.SensorWater:
                    case SPK.SensorSmoke:
                    case SPK.SensorHelp:
                        {
                            keyVlaue = "status";
                            if (!Is_SpkAttribute(keyVlaue)) {
@@ -966,12 +983,14 @@
                {
                    case StringId.xieluo:
                    case StringId.luoshui:
                    case StringId.qiujiu:
                        {
                            value = "alarm";
                        }
                        break;
                    case StringId.wuxieluo:
                    case StringId.wuluoshui:
                    case StringId.zhengchang:
                        {
                            value = "normal";
                        }
@@ -979,11 +998,19 @@
                    case StringId.onLogic:
                        {
                            value = "on";
                            if (device.spk== SPK.SensorDryContact) {
                                value = "open";
                            }

                        }
                        break;
                    case StringId.offLogic:
                        {
                            value = "off";
                            if (device.spk == SPK.SensorDryContact)
                            {
                                value = "close";
                            }
                        }
                        break;
                    case StringId.youren:
@@ -1097,7 +1124,7 @@
            if (device.spk == SPK.SensorLight)
            {
                //照明传感器
                max =int.MaxValue;
                max =1200;
            }

            new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>