34444444

黄学彪

2020-05-19 7dd4be37cdedaf81ad40990d8cb8dce164d83f4d

 ZigbeeApp/Shared/Common/Device.cs

@@ -732,7 +732,7 @@
        /// <returns></returns>

        public bool DeviceIsCanFixedPosition(CommonDevice device)

        {

            if (device.Type == DeviceType.DoorLock)

            if (device.Type == DeviceType.DoorLock || device.Type == DeviceType.PMSensor)

            {

                //门锁没有定位功能

                return false;

@@ -1982,6 +1982,16 @@
                    this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;

                    save = true;

                }

                else

                {

                    //2020.05.18追加:如果记录的房间ID是不存在的话,则重新覆盖

                    var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[listDevice[0].DeviceAddr]);

                    if (room == null)

                    {

                        this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;

                        save = true;

                    }

                }

            }



            if (save == true)

@@ -2063,6 +2073,25 @@
            HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);

        }



        /// <summary>

        /// 根据房间ID,移除指定的真实物理设备的所属房间记录

        /// </summary>

        /// <param name="i_RoomId"></param>

        public void DeleteRealDeviceByRoomId(string i_RoomId)

        {

            var listDeleteKey = new List<string>();

            foreach (var deviceAddr in this.dicDeviceRoomId.Keys)

            {

                if (this.dicDeviceRoomId[deviceAddr] == i_RoomId

                    && listDeleteKey.Contains(deviceAddr) == false)

                {

                    listDeleteKey.Add(deviceAddr);

                }

            }

            //将真实物理设备从房间中移除

            this.DeleteRealDeviceFromRoom(listDeleteKey);

        }



        #endregion



        #region ■ 设备排序___________________________