Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC

gxc

2019-10-29 ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf

 ZigbeeApp/Shared/Common/Room.cs

@@ -216,8 +216,9 @@
            get
            {
                List<DeviceUI> deviceList = new List<DeviceUI>();
                foreach (var room in Lists)
                {
                for (int i = 0; i < Lists.Count; i++)
                {

                    var room = Lists[i];
                    if (room.IsSharedRoom)
                    {
                        continue;
@@ -226,8 +227,9 @@
                    {
                        continue;
                    }
                    foreach (var device in room.DeviceUIList)
                    for (int j = 0; j < room.DeviceUIList.Count; j++)
                    {
                        var device = room.DeviceUIList[j];
                        if (device == null || device.CommonDevice == null)
                        {
                            continue;
@@ -394,7 +396,7 @@
        /// 获取喜爱房间
        /// </summary>
        /// <returns></returns>
        public  Room GetLoveRoom()
        public Room GetLoveRoom()
        {
            return CurrentRoom.GetRoomById(LoveRoomId);
        }
@@ -504,6 +506,10 @@
        /// <param name="roomId">房间ID</param>
        public Room GetRoomById(string roomId)
        {
            if (string.IsNullOrEmpty(roomId))
            {
                return null;
            }
            return Lists.Find((obj) => obj.Id == roomId);
        }

@@ -994,7 +1000,7 @@
                    return -1;
                }
            }
            

            var getSceneIdAllData = await ZigBee.Device.Scene.GetSceneNewIdAsync(sceneName);
            if (getSceneIdAllData == null || getSceneIdAllData.getSceneIdData == null)
            {
@@ -1480,6 +1486,6 @@
        }



        #endregion
       

    }
}