代码合并

wei

2021-07-06 cb20b108eca5dca69866ad741f35c612fc648a3a

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

@@ -161,7 +161,7 @@
                    }
                    break;
                //超声波传感器
                case SPK.SensoruUtrasonic:
                case SPK.SensorUtrasonic:
                    {

                        LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -203,7 +203,7 @@
                    }
                    break;
                //环境检测传感器
                case SPK.SenesorEnvironment:
                case SPK.SensorEnvironment:
                    {
                        #region 界面
                        ///温度
@@ -366,7 +366,7 @@
                    case SPK.SensorDuiShe:
                    case SPK.SensorPir:
                    case SPK.SensorDoorWindow:
                    case SPK.SensoruUtrasonic:
                    case SPK.SensorUtrasonic:
                        {
                            keyVlaue = "status";
                        }