Merge branch 'NewFilePath' into CJL

JLChen

2020-12-12 f2c1e5bf3a67478076fb5bbcf546824b3127db15

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

@@ -642,7 +642,7 @@

            bool initTitleButton = true;

            foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
            foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience)
            {
                if (tempSensor.sid == sensor.sid)
                {
@@ -893,7 +893,7 @@
//                    });
//#endif

                    foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
                    foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
                    {
                        if (sr.functionType != sensor.functionType)
                        {