合并了代码

黄学彪

2019-12-13 6cbd0936d3245fd7c433884ac9c1f5448a7cf657

 ZigbeeApp/Shared/Common/Device.cs

@@ -72,6 +72,10 @@
        /// </summary>

        private Dictionary<string, string> dicDeviceModelIdChanged = null;

        /// <summary>

        /// 图片共有(keys:指定设备的具体类型 value:指定共有对象的具体类型)

        /// </summary>

        private Dictionary<string, string> dicPictrueShard = null;

        /// <summary>

        /// 本地所有设备的缓存(非公开)

        /// </summary>

        private Dictionary<string, CommonDevice> dicAllDevice = new Dictionary<string, CommonDevice>();

@@ -1039,6 +1043,13 @@
            //获取它属于什么类型的设备

            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);

            string strConcrete = Enum.GetName(typeof(DeviceConcreteType), myDeviceType.ConcreteType);

            
            //图片共有

            if (this.dicPictrueShard.ContainsKey(strConcrete) == true)

            {

                strConcrete = this.dicPictrueShard[strConcrete];

            }



            string strType = strConcrete.Replace("_", string.Empty);

            //将类型转为图片地址

            string imageFilePath = "RealDevice/" + strType + ".png";

@@ -1111,6 +1122,12 @@
        {

            //将具体类型转字符串

            string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);

            //图片共有

            if (this.dicPictrueShard.ContainsKey(strSpecific) == true)

            {

                strSpecific = this.dicPictrueShard[strSpecific];

            }



            string strType = strSpecific.Replace("_", string.Empty);

            //将类型转为图片地址

            string imageFilePath = "Device/" + strType + ".png";

@@ -2051,6 +2068,9 @@
            this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2按键触摸面板

            this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12按键触摸面板

            this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4按键触摸面板(只带电源底座)

            this.dicDeviceModelIdEnum["MPT4R4L/S-ZB1.8"] = "220-200";//简约4按键面板

            this.dicDeviceModelIdEnum["MPT3R3L/S-ZB1.8"] = "221-200";//简约3按键面板

            this.dicDeviceModelIdEnum["MPT2R2L/S-ZB1.8"] = "222-200";//简约2按键面板



            //=========★★PIR传感器类(1200-1299)★★=========

            this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir传感器220

@@ -2094,6 +2114,12 @@
            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";//紧急按键



            //需要共有的图片对象

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

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

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

            this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//简约2按键面板 沿用 2按键的图标

        }



        #endregion

@@ -2153,6 +2179,18 @@
        /// 4按键多功能触摸面板（只带电源底座） 镜像id：210

        /// </summary>

        ButtonPanel_FourNotPower = 210,

        /// <summary>

        /// 简约4按键面板 镜像id：220

        /// </summary>

        ButtonPanel_SimpleFour = 220,

        /// <summary>

        /// 简约3按键面板 镜像id：221

        /// </summary>

        ButtonPanel_SimpleThree = 221,

        /// <summary>

        /// 简约2按键面板 镜像id：222

        /// </summary>

        ButtonPanel_SimpleTwo = 222,



        //=========★★PIR传感器类(1200-1299)★★=========

        /// <summary>