Merge branch 'wjc' into Dev-Branch

mac

2023-09-25 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd

 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.qiujiuandzhengchang;
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang );
                        };
                        if (edit)
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;
                //超声波传感器
                case SPK.SensorUtrasonic:
                    {
@@ -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";
                        }