HDL Home App 第二版本 旧平台金堂用 正在使用
xm
2019-11-21 ec35d79add60d1438dff5291389f7e69c579d9f9
ZigbeeApp/Shared/Common/SceneUI.cs
old mode 100755 new mode 100644
@@ -119,6 +119,26 @@
            return $"{floorName},{room.Name}";
        }
        /// <summary>
        /// GetZone
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public static string GetZone(int id)
        {
            var room = Room.CurrentRoom.GetRoomBySceneId(id);
            if (room == null)
            {
                return null;
            }
            var floorName = Shared.Common.Config.Instance.Home.GetFloorNameById(room.FloorId);
            if (floorName == null)
            {
                return room.Name;
            }
            return $"{floorName},{room.Name}";
        }
        #endregion
        #region ◆ 编辑场景_________________________
@@ -165,7 +185,8 @@
                                    var dev = Room.AllRoomDeviceUIList.Find((obj) => obj.DeviceEpoint == sceneDev.Epoint && obj.DeviceAddr == sceneDev.DeviceAddr);
                                    if(dev!=null)
                                    {
                                        var sceneTargetDevice = new SceneTargetDeviceUI {
                                        var sceneTargetDevice = new SceneTargetDeviceUI
                                        {
                                            Type = 0,
                                            DeviceUI = dev,
                                            TaskList = sceneDev.TaskList,
@@ -180,7 +201,8 @@
                                    var localScene = Room.AllRoomSceneUIList.Find((obj) => obj.Id == sceneDev.ElseScenesId);
                                    if (localScene != null)
                                    {
                                        var sceneTargetDeviceScene = new SceneTargetDeviceUI {
                                        var sceneTargetDeviceScene = new SceneTargetDeviceUI
                                        {
                                            Type = 1,
                                            ElseScenesId = sceneDev.ElseScenesId,
                                            SceneName = localScene.Name,