Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

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

old mode 100644
new mode 100755
@@ -370,7 +370,7 @@
                var sensorTag = sensor.sid;
                if (sensor.bus != null)
                {
                    sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.loopId;
                    sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.LoopId;
                }
                FrameLayout sensorView = new FrameLayout()
                {