备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

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

old mode 100644
new mode 100755
@@ -63,7 +63,7 @@
                    }

                    this.dicScenes[tempScene.Id] = tempScene;

                }

                catch (Exception ex)

                catch(Exception ex)

                {

                    HdlLogLogic.Current.WriteLog(ex);

                    try

@@ -689,7 +689,7 @@
            {

                return null;

            }

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

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

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

            if (string.IsNullOrEmpty(floorName))

            {

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

                }

            }



            if (sceneUIs.Count == 0)

            {

                return null;

            }

            return sceneUIs;

        }



@@ -748,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)

@@ -755,8 +755,8 @@
                        sceneUIs.Add(this.dicScenes[sceneId]);

                    }

                }

            }

            }

            
            return sceneUIs;

        }