优化代码，更改门锁需求接口

xm

2020-04-29 07466c19110693e3e439a7d7c8ad0bc21d9b3287

 ZigbeeApp/Shared/Common/Device.cs

old mode 100644
new mode 100755
@@ -400,6 +400,27 @@
            }

        }



        /// <summary>

        /// 添加虚拟设备到缓存

        /// </summary>

        /// <param name="device">设备对象</param>

        public void AddVirtualDeviceToMemory(CommonDevice device)

        {

            string mainKeys = this.GetDeviceMainKeys(device);

            this.dicAllDevice[mainKeys] = device;



            //设备回路收集

            if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)

            {

                this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();

            }

            if (this.dicDeviceEpoint[device.DeviceAddr].Contains(device.DeviceEpoint) == false)

            {

                this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);

            }

            device.ReSave();

        }



        #endregion



        #region ■ 修改设备___________________________

@@ -416,6 +437,12 @@
            this.SetEpointName(device, newName);



            this.BackupDeviceAfterReName(device);



            //如果住宅为虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return true;

            }



            //不再检测名字是否一样

            //成员只能修改自己本地的名字

@@ -462,6 +489,11 @@


                //更改名字后，刷新设备缓存

                this.BackupDeviceAfterReName(device2);

            }

            //如果住宅为虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return true;

            }



            CommonDevice device = listDevice[0];

@@ -679,7 +711,11 @@
        /// <param name="device"></param>

        public void SetFixedPositionCommand(CommonDevice device)

        {

            //如果当前住宅不是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == false)

            {

            device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);

            }

        }



        /// <summary>

@@ -2024,13 +2060,13 @@
            list.Add(DeviceBeloneType.A插座);

            list.Add(DeviceBeloneType.A调光器);

            list.Add(DeviceBeloneType.A窗帘);

            list.Add(DeviceBeloneType.A新风);

            list.Add(DeviceBeloneType.A空调);

            list.Add(DeviceBeloneType.A继电器);

            list.Add(DeviceBeloneType.A干接点);

            list.Add(DeviceBeloneType.A智能门锁);

            list.Add(DeviceBeloneType.A智能空开);

            list.Add(DeviceBeloneType.A传感器);


            //其他的看着办呗,都是排在后面的,都归为这个属性
            list.Add(DeviceBeloneType.A未知设备);

@@ -2509,10 +2545,7 @@
            else if (deviceType == DeviceType.FreshAir) { device = new FreshAir(); }

            else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }

            else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }

            else if (deviceType == DeviceType.FreshAirHumiditySensor)

            {

                device = new HumiditySensor();

            }

            else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }

            else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }

            else { return null; }



@@ -2652,6 +2685,7 @@
            this.dicDeviceModelIdChanged["MULTI-MOTI--EA04"] = "MSPIR01/M-ZB.10";//红外传感器

            this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//水浸传感器

            this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//紧急按键




            //✩✩✩✩✩需要共有的图片对象✩✩✩✩✩
@@ -2824,11 +2858,6 @@
        /// </summary>

        Sensor_Humidity = -1310,



        /// <summary>

        /// PM2.5传感器

        /// </summary>

        Sensor_PM = -1311,



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

        /// <summary>

        /// 继电器

@@ -2963,10 +2992,6 @@
        /// </summary>

        A继电器 = 2300,
        /// <summary>

        /// 新风

        /// </summary>

        A新风 = 2310,

        /// <summary>

        /// 调光器(2500-2799)

        /// </summary>

        A调光器 = 2500,

@@ -3022,6 +3047,10 @@
        /// 干接点

        /// </summary>

        A干接点 = 16,
        /// <summary>

        /// 新风

        /// </summary>

        A新风 = 17

    }



    #endregion