Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Common/Device.cs

old mode 100755
new mode 100644
@@ -115,7 +115,7 @@
            {

                CommonDevice device = null;

                //反序列化为指定的类，不然数据会丢失而导致无法强转

                try 
                try
                {

                    device = CommonDevice.CommonDeviceByFilePath(file);

                }

@@ -271,7 +271,7 @@
                //添加缓存

                this.AddDeviceToMemory(ref device);



                //移除存在的设备内存 
                //移除存在的设备内存

                string maikey = this.GetDeviceMainKeys(device);

                if (dicExist.ContainsKey(maikey) == true)

                {

@@ -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 ■ 设备排序___________________________

@@ -2133,8 +2162,8 @@
            list.Add(DeviceBeloneType.A传感器);



            //其他的看着办呗,都是排在后面的,都归为这个属性

            list.Add(DeviceBeloneType.A未知设备);

            
            list.Add(DeviceBeloneType.A未知设备);

            return list;

        }



@@ -2185,7 +2214,7 @@
            var listDevice = this.GetDevicesByMac(i_device.DeviceAddr, false);

            foreach (var device in listDevice)

            {

                //0:离线 1:在线 2:正在刷新状态 
                //0:离线 1:在线 2:正在刷新状态

                bool statu = i_device.IsOnline == 1 || i_device.IsOnline == 2;

                if (statu == true)

                {

@@ -2776,7 +2805,7 @@
            this.dicDeviceModelIdEnum["MGCD01/ZB.10"] = "1306-1200-60000";//吸顶燃气传感器



            //PM2.5空气质量传感器 【该设备属于第三方设备，没有镜像ID】

            this.dicDeviceModelIdEnum["SZ_PM100"] = "1307-1200-60000";//PM2.5空气质量传感器 
            this.dicDeviceModelIdEnum["SZ_PM100"] = "1307-1200-60000";//PM2.5空气质量传感器



            //=========★★继电器类(2300-2499)★★=========

            this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3路继电器小模块

@@ -3006,9 +3035,9 @@
        /// <summary>

        /// 方悦新风小模块 镜像id：2310

        /// </summary>

        Relay_FangyueFreshAirModul = 2310,

		
        //=========★★调光器类(2500-2799)★★=========

        Relay_FangyueFreshAirModul = 2310,

        //=========★★调光器类(2500-2799)★★=========
        /// <summary>

        /// 调光器

        /// </summary>