2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs

@@ -684,13 +684,14 @@
        /// <returns></returns>

        public string GetZoneById(int sceneId)

        {

            var room =HdlRoomLogic.Current.GetRoomBySceneId(sceneId);

            var room = HdlRoomLogic.Current.GetRoomBySceneId(sceneId);

            if (room == null)

            {

                return null;

            }

            var floorName = Shared.Common.Config.Instance.Home.GetFloorNameById(room.FloorId);

            if (floorName == null)

            var floorName = HdlResidenceLogic.Current.GetFloorNameById(room.FloorId);

            //更改代码：如果floorName=“”也要判断，否则有“，”

            if (string.IsNullOrEmpty(floorName))

            {

                return room.Name;

            }

@@ -729,11 +730,6 @@
                    sceneUIs.Add(myScene);

                }

            }



            if (sceneUIs.Count == 0)

            {

                return null;

            }

            return sceneUIs;

        }



@@ -747,6 +743,11 @@
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();

            foreach (var room in listAllRoom)

            {

                if (room.IsLove == true)

                {

                    //不包含收藏房间

                    continue;

                }

                foreach (int sceneId in room.ListSceneId)

                {

                    if (this.dicScenes.ContainsKey(sceneId) == true)