Merge branch 'master' into NewFilePath

wei

2020-12-16 227bd88c1c8e41366c4bbffc54ee2b1fcbe35065

 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)