Merge branch 'dev-tzy' into dev-2020xm

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

 Home0618/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

@@ -179,7 +179,7 @@
            bottomFrameLayout.AddChidren(btnFinish);
            #endregion

            #region 数据处理  
            #region 数据处理
            //获取楼层
            dicFloor = HdlRoomLogic.Current.GetFloorSortList();
            currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
@@ -942,7 +942,7 @@
        List<SceneUI> GetALlDispalyRoomSceneList()
        {
            currentKeyAllRoomSceneList.Clear();
            // 获取所有房间 
            // 获取所有房间
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            foreach (var room in listAllRoom)
            {