Merge branch 'NewFilePath' into CJL

JLChen

2020-12-17 3246b9db47308cc809df595a5cb704fc82c96439

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

@@ -353,7 +353,7 @@
        {
            sensorListView.RemoveAll();
            int index = 0;
            foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
            foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
            {
                LoadSensorDiv(sensor, index);
                index++;
@@ -368,9 +368,9 @@
            if (room.roomId == "" ||  sensor.roomIds.Contains(room.roomId))
            {
                var sensorTag = sensor.sid;
                if (sensor.bus_Data != null)
                if (sensor.bus != 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.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.LoopId;
                }
                FrameLayout sensorView = new FrameLayout()
                {