合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Common/Device.cs

@@ -543,6 +543,12 @@
        /// <param name="deleteRoom">是否从房间删除</param>

        public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)

        {

            if (deleteRoom == true && Room.CurrentRoom != null)

            {

                //从房间中删除

                Room.CurrentRoom.DeleteDevice(device);

            }



            //删除缓存

            string mainKeys = this.GetDeviceMainKeys(device);

            lock (dicAllDevice)

@@ -592,12 +598,6 @@
                    }

                }

                this.dicOTADevice.Remove(otaKeys);

            }



            if (deleteRoom == true && Room.CurrentRoom != null)

            {

                //从房间中删除

                Room.CurrentRoom.DeleteDevice(device);

            }

        }



@@ -2058,6 +2058,14 @@
            //定义规则：模块ID(已翻译)=设备具体类型值-设备所属类型值(自定义的值,嘛,只要不重复就可以)

            //第一个值是:DeviceConcreteType  第二个值是:DeviceBeloneType



            //*********************************************************************

            //新设备添加方法：

            //1、在这里填写上模块ID，然后是 DeviceConcreteType ，然后是 DeviceBeloneType

            //2、然后在最下面添加【设备的具体类型】，【设备的所属类型】

            //3、已设备的具体类型为名字(去掉【-】)添加设备的【所属图片】，【真实物理图片】。回路图片需要特殊处理

            //4、添加R文件,添加Language文件

            //*********************************************************************



            //=========★★开合帘类(100-199)★★=========

            this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//智能开合帘电机

            this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//智能管状电机

@@ -2105,7 +2113,7 @@
            this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee转buspro协议转换器

            this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee转485协议转换器



            //需要交换的模块ID

            //✩✩✩✩✩需要交换的模块ID✩✩✩✩✩

            this.dicDeviceModelIdChanged = new Dictionary<string, string>();

            //=========★★安防类传感器类★★=========

            this.dicDeviceModelIdChanged["MULTI-GASE--EA07"] = "MSG01/M-ZB.10";//燃气传感器

@@ -2115,7 +2123,7 @@
            this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//水浸传感器

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



            //需要共有的图片对象

            //✩✩✩✩✩需要共有的图片对象✩✩✩✩✩

            this.dicPictrueShard = new Dictionary<string, string>();

            this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//简约4按键面板 沿用 4按键的图标

            this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//简约3按键面板 沿用 3按键的图标