old mode 100755
new mode 100644
| | |
| | | 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 ◆ 编辑场景_________________________ |
| | |
| | | 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, |
| | |
| | | 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, |