请合并代码，优化面板问题

xm

2020-05-18 cf0bffdf072bae11bdb8c780d0a355818700f713

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

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

                    this.dicScenes[tempScene.Id] = tempScene;

                }

                catch(Exception ex)

                catch (Exception ex)

                {

                    HdlLogLogic.Current.WriteLog(ex);

                    try

@@ -589,13 +589,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)

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

            if (string.IsNullOrEmpty(floorName))

            {

                return room.Name;

            }

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

                    }

                }

            }

            
            }

            return sceneUIs;

        }