2019.10.14

gxc

2019-10-14 76bee0cb59c06d4616d70aace2cff4223c76a469

 ZigbeeApp/Shared/Common/Room.cs

old mode 100755
new mode 100644
@@ -36,14 +36,24 @@
        /// 楼层Id
        /// 新增时使用Guid
        /// </summary>
        public string FloorId = string.Empty;
        public string FloorId = "Floor1";
        /// <summary>
        /// 楼层名称
        /// </summary>
        public string FloorName
        {
            get
            {
               return Config.Instance.Home.GetFloorNameById(FloorId);
            }
        }
        /// <summary>
        /// 房间名
        /// </summary>
        public string Name = string.Empty;

        /// <summary>
        /// 房间的时候背景图
        /// 房间背景图
        /// </summary>
        public string BackgroundImage = string.Empty;

@@ -56,6 +66,15 @@
        /// 楼层--备用
        /// </summary>
        public Dictionary<string, string> FloorList = new Dictionary<string, string> { };

        /// <summary>

        /// 温度传感器(设备主键)

        /// </summary>
        public string TemperatrueDevice = string.Empty;
        /// <summary>

        /// 湿度传感器(设备主键)

        /// </summary>
        public string HumidityDevice = string.Empty;

        /// <summary>
        /// 当前选择的房间
@@ -73,6 +92,11 @@
        public readonly List<string> DeviceUIFilePathList = new List<string>();

        /// <summary>
        /// 喜爱房间id
        /// </summary>
        public const string LoveRoomId= "Favorite";

        /// <summary>
        /// 是否是默认喜爱房间
        /// </summary>
        /// <value><c>true</c> if is love; otherwise, <c>false</c>.</value>
@@ -81,7 +105,7 @@
        {
            get
            {
                return Id == "Favorite";
                return Id == LoveRoomId;
            }
        }

@@ -110,8 +134,7 @@
                {
                    return new List<string> { };
                }
                var loveRoom = Lists[0];
                return loveRoom.DeviceUIFilePathList;
                return GetLoveRoom().DeviceUIFilePathList;
            }
        }

@@ -204,7 +227,7 @@
            if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
            {
                //默认添加喜爱的房间--禁止修改房间名
                var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "Room/r0.png", Id = "Favorite" };
                var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "Room/r0.png", Id = LoveRoomId };
                love.Save(true);
                //添加到house 房间路径列表
                var currentHome = Config.Instance.Home;
@@ -323,6 +346,15 @@
        #region ◆ 获取房间________________________

        /// <summary>
        /// 获取喜爱房间
        /// </summary>
        /// <returns></returns>
        public static Room GetLoveRoom()
        {
            return CurrentRoom.GetRoomById(LoveRoomId);
        }

        /// <summary>
        /// 通过路径获取房间
        /// </summary>
        /// <returns>The room by file path.</returns>
@@ -430,6 +462,17 @@
            return Lists.Find((obj) => obj.Id == roomId);
        }


        /// <summary>
        /// 根据房间名字，获取房间对象
        /// </summary>
        /// <returns>The room by name.</returns>
        /// <param name="roomName">房间名</param>
        public Room GetRoomByName(string roomName)
        {
            return Lists.Find((obj) => obj.Name == roomName);
        }

        /// <summary>
        /// 根据设备获取房间名字(楼层+房间名)
        /// </summary>
@@ -500,6 +543,20 @@
            return null;
        }

        /// <summary>
        /// 获取多个房间的连接起来的名字
        /// </summary>
        /// <param name="listName"></param>
        /// <returns></returns>
        public string GetRoomName(List<string> listName)
        {
            if (listName.Count == 0)
            {
                //未分配区域
                return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
            }
            return string.Join(",", listName);
        }

        #endregion

@@ -670,7 +727,6 @@
        #endregion

        #region ◆ 删除设备_________________________

        /// <summary>
        /// 删除功能-设备
        /// </summary>
@@ -786,6 +842,28 @@
            }
        }

        /// <summary>

        /// 获取当前房间下的全部设备

        /// </summary>

        /// <returns></returns>
        public List<CommonDevice> GetRoomListDevice()

        {

            var listDevice = new List<CommonDevice>();

            foreach (var device in this.DeviceUIList)

            {

                if (device == null || device.CommonDevice == null)

                {

                    continue;

                }

                listDevice.Add(device.CommonDevice);

            }

            if (listDevice.Count == 0)

            {

                return listDevice;

            }

            return Common.LocalDevice.Current.SortDevice(listDevice);

        }

        #endregion

        #region ◆ 添加场景_________________________
@@ -895,6 +973,28 @@
            Save();
        }

        #endregion

        #region ◆ 设备是否收藏______________________

        /// <summary>
        /// 是否是收藏设备
        /// </summary>
        /// <param name="room"></param>
        /// <param name="filePath"></param>
        /// <returns></returns>
        public bool IsCollectInRoom(Room room,string filePath)
        {
            if(room.IsLove)
            {
                return true;
            }
            if (GetLoveRoom().DeviceUIFilePathList.Find((obj) => obj == filePath) == null)
            {
                return false;
            }
            return true;
        }
        #endregion

        #region ◆ 修改场景________________________
@@ -1121,7 +1221,7 @@
            var dicRoom = new Dictionary<string, Common.Room>();

            foreach (var room in Common.Room.Lists)

            {

                if (room.FloorId != i_floorKeys)

                if (room.FloorId != i_floorKeys || room.IsLove == true)

                {

                    //不是同一个楼层

                    continue;

@@ -1237,6 +1337,8 @@
            //克隆属性

            newRoom.Id = this.Id;

            newRoom.FloorId = this.FloorId;

            newRoom.TemperatrueDevice = this.TemperatrueDevice;

            newRoom.HumidityDevice = this.HumidityDevice;

            newRoom.Name = this.Name;

            newRoom.BackgroundImage = this.BackgroundImage;

            newRoom.BackgroundImageType = this.BackgroundImageType;

@@ -1245,5 +1347,6 @@
        }



        #endregion
       
    }
}