Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

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

@@ -151,15 +151,15 @@

            foreach (var function in DB_ResidenceData.functionList.scenes)
            {
                var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
                if (sbkScene != null)
                {
                    addedList.Add(function);
                }
                else
                {
                    notAddedList.Add(function);
                }
                //var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
                //if (sbkScene != null)
                //{
                //    addedList.Add(function);
                //}
                //else
                //{
                //    notAddedList.Add(function);
                //}
            }
            foreach (var ddd in sbk_Devcie.number)
            {