Merge branch 'NewFilePath' into CJL

JLChen

2020-12-12 f2c1e5bf3a67478076fb5bbcf546824b3127db15

 HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs

@@ -149,7 +149,7 @@
            };
            bodyView.AddChidren(sceneListView);

            foreach (var function in DB_ResidenceData.functionList.scenes)
            foreach (var function in FunctionList.List.scenes)
            {
                //var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
                //if (sbkScene != null)