Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-07-08 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac

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

@@ -258,7 +258,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SensoruUtrasonic:
                                case SPK.SensorUtrasonic:
                                    {
                                        string str = "";
                                        foreach (var dic in dicList)
@@ -315,7 +315,7 @@
                                        }
                                    }
                                    break;
                                case SPK.SenesorEnvironment:
                                case SPK.SensorEnvironment:
                                    {
                                        string strtext = "";
                                        foreach (var dic in dicList)
@@ -599,7 +599,7 @@
                            {
                                //用sid找到设备；
                                var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
                                if (device.spk == SPK.SenesorEnvironment)
                                if (device.spk == SPK.SensorEnvironment)
                                {
                                    //这个设备比较特殊
                                    ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
@@ -1549,7 +1549,7 @@
                        }
                    }
                    break;
                case SPK.SensoruUtrasonic:
                case SPK.SensorUtrasonic:
                    {
                        foreach (var dic in dicList)
                        {