2019.10.17

gxc

2019-10-17 1f65fe366062b3f2cda6b03e1849afce6d2646f8

 ZigbeeApp/Shared/Common/Room.cs

@@ -36,7 +36,7 @@
        /// 楼层Id
        /// 新增时使用Guid
        /// </summary>
        public string FloorId = "Floor1";
        public string FloorId = string.Empty;
        /// <summary>
        /// 楼层名称
        /// </summary>
@@ -134,7 +134,7 @@
                {
                    return new List<string> { };
                }
                return GetLoveRoom().DeviceUIFilePathList;
                return CurrentRoom.GetLoveRoom().DeviceUIFilePathList;
            }
        }

@@ -349,7 +349,7 @@
        /// 获取喜爱房间
        /// </summary>
        /// <returns></returns>
        public static Room GetLoveRoom()
        public  Room GetLoveRoom()
        {
            return CurrentRoom.GetRoomById(LoveRoomId);
        }
@@ -462,7 +462,6 @@
            return Lists.Find((obj) => obj.Id == roomId);
        }


        /// <summary>
        /// 根据房间名字，获取房间对象
        /// </summary>
@@ -544,18 +543,53 @@
        }

        /// <summary>
        /// 获取多个房间的连接起来的名字
        /// 获取当前楼层的房间
        /// </summary>
        /// <param name="listName"></param>
        /// <param name="id"></param>
        /// <returns></returns>
        public string GetRoomName(List<string> listName)
        public  List<Room> GetRoomsByFloorId(string id)
        {
            if (listName.Count == 0)
            return Lists.FindAll((obj) => obj.FloorId==id);
        }
        /// <summary>
        /// 获取当前楼层的房间名称
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public  List<string> GetRoomNamesByFloorId(string id)
        {
            List<string> names = new List<string> { };
            foreach(var r in Lists)
            {
                //未分配区域
                return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
                if(r.FloorId==id)
                {
                    names.Add(r.Name);
                }
            }
            return string.Join(",", listName);
            return names;
        }

        /// <summary>
        /// 获取当前楼层的房间(拼接了【常用】在第一位)
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public  List<Room> GetRoomsByFloorIdAppendLoveRoom(string id)
        {
            var r= Lists.FindAll((obj) => obj.FloorId == id);
            r.Insert(0, GetLoveRoom());
            return r;
        }

        /// <summary>
        /// 获取当前楼层的房间(拼接了【常用】在第一位)
        /// </summary>
        /// <returns></returns>
        public  List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
        {
            var r = Lists.FindAll((obj) => obj.FloorId == Config.Instance.Home.CurrentFloorId);
            r.Insert(0, GetLoveRoom());
            return r;
        }

        #endregion
@@ -864,6 +898,56 @@
            return Common.LocalDevice.Current.SortDevice(listDevice);

        }

        /// <summary>
        /// 获取房间设备类型
        /// </summary>
        /// <param name="room"></param>
        /// <returns></returns>
        public static List<DeviceType> GetdeviceTypes(Room room)
        {
            List<DeviceType> typeList = new List<DeviceType> { };
            foreach (var deviceUI in room.DeviceUIList)
            {
                if (deviceUI == null || deviceUI.CommonDevice == null)
                {
                    continue;
                }
                if (!typeList.Contains(deviceUI.CommonDevice.Type))
                {
                    typeList.Add(deviceUI.CommonDevice.Type);
                }
            }
            return typeList;
        }

        /// <summary>
        /// 获取该类型的设备
        /// </summary>
        /// <param name="room"></param>
        /// <param name="deviceType"></param>
        /// <returns></returns>
        public static List<DeviceUI> GetDeviceUIs(Room room ,DeviceType deviceType)
        {
            List<DeviceUI> typeList = new List<DeviceUI> { };
            foreach (var deviceUI in room.DeviceUIList)
            {
                if (deviceUI == null || deviceUI.CommonDevice == null)
                {
                    continue;
                }
                if(deviceUI.CommonDevice.Type!=deviceType)
                {
                    continue;
                }
                if (!typeList.Contains(deviceUI))
                {
                    typeList.Add(deviceUI);
                }
            }
            return typeList;
        }


        #endregion

        #region ◆ 添加场景_________________________