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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -11,7 +11,7 @@
        }

        public static ZigbeeColor Current;
       

        #region 徐梅
        public uint MainColor = 0xFFEAEAEA;
        public uint BottomMenuColor = 0xFFFFFFFF;
@@ -237,6 +237,14 @@
        /// GXCWaveSeekBarColor 0xFFFE4F35
        /// </summary>
        public uint GXCWaveSeekBarColor = 0xFFFE4F35;
        /// <summary>
        /// 0xFFFDB500
        /// </summary>
        public uint GXCProgressColor = 0xFFFDB500;
        /// <summary>
        /// 0xFFF5F5F5
        /// </summary>
        public uint GXCSeekBarBackground = 0xFFF5F5F5;