合并了代码

黄学彪

2019-10-28 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9

 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;

@@ -23,7 +22,7 @@
            {
                //if (msg.Contains("DeviceStatusReport") == false)

                //{

                System.Console.WriteLine(msg);

                System.Console.WriteLine(msg + "  " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);

                //}
            }
        }
@@ -212,12 +211,12 @@
                else if (this.Type == DeviceType.ColorDimmableLight)
                {
                    //彩灯
                    IconPath = "Device/ColorDimmableLight.png";
                    IconPath = "Device/ColorLight.png";
                }

                else if (this.Type == DeviceType.DimmableLight)
                {
                    //调光器
                    IconPath = "Device/ColorDimmableLight.png";
                    IconPath = "Device/Light.png";
                }
                else if (this.Type == DeviceType.OnOffOutput)
                {
@@ -293,9 +292,9 @@
        /// </summary>
        public DeviceType Type = DeviceType.UnKown;
        /// <summary>

        /// 设备的功能类型(此类型目前只针对继电器回路有效,默认为灯光)

        /// 设备的功能类型(此类型目前只针对继电器回路有效,默认未指定)

        /// </summary>
        public DeviceFunctionType DfunctionType = DeviceFunctionType.A灯光;
        public DeviceFunctionType DfunctionType = DeviceFunctionType.A未定义;
        /// <summary>
        /// MAC地址
        /// </summary>