Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

@@ -20,10 +20,10 @@
        {
            if (flage == true)
            {
                //if (msg.Contains("DeviceStatusReport") == false)

                //{

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

                //}
                if (msg.Contains("DeviceStatusReport") == false)

                {

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

                }
            }
        }

@@ -415,10 +415,6 @@
        /// 序列号
        /// </summary>
        public string SerialNumber = string.Empty;
        /// <summary>

        /// 整个设备所属的区域ID(因为设备也能够分配区域了)

        /// </summary>
        public string DeviceRoomId = string.Empty;
        /// <summary>
        /// 所有指定cluster是否都已经成功绑定协调器
        ///<para>0:未完全绑定</para>