Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs

@@ -21,7 +21,7 @@
                        var sensorTag = sensor.sid;
                        if (sensor.bus_Data != null)
                        {
                            sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.LoopID;
                            sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.loopId;
                        }
                        var view = bodyView.sensorListView.GetChildren(i);
                        if (view.GetType() == typeof(FrameLayout))