2019.12.3

gxc

2019-12-03 642fcdaeb496d9a8f3154e17fd76005be3fcf197

 ZigbeeApp/Shared/Common/Device.cs

@@ -1524,7 +1524,8 @@
        /// </summary>
        /// <param name="listDevice">需要保存的设备对象</param>
        /// <param name="roomId">需要保存的哪个设备的房间ID</param>
        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId)
        /// <param name="saveRoadDevice">如果只有一个回路,是否把回路的房间一起修改</param>

        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)

        {
            if (listDevice != null)
            {
@@ -1535,10 +1536,13 @@
            string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
            UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);

            //添加自动备份

            HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);



            //如果设备只有一个回路，如果改变了真实设备区域，则它的回路的区域也一起改了
            if (listDevice != null && listDevice.Count == 1)
            if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)

            {
                Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId);
                Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId, false);

            }
        }