合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -182,17 +182,25 @@
        /// </summary>
        public uint GXCSelectedLineColor = 0xFFFC744B;
        /// <summary>
        /// 浅色线条 0xFFF5F6FA;
        /// 浅色线条 0x80CCCCCC
        /// </summary>
        public uint GXCGrayLineColor = 0xFFF5F6FA;
        public uint GXCGrayLineColor = 0x80CCCCCC;
        /// <summary>
        /// 浅色线条 0x66CCCCCC
        /// </summary>
        public uint GXCGrayLineColor2 = 0x66CCCCCC;
        ///// <summary>
        ///// 浅色线条 0xFFEBEBEB
        ///// </summary>
        //public uint GXCGrayLineColor2 = 0xFFEBEBEB;
        /// <summary>
        /// 浅色线条 0xFFB7B8BB
        /// </summary>
        public uint GXCGrayLineColor3 = 0xFFB7B8BB;
        /// <summary>
        /// 0x40000000
        /// </summary>
        public uint GXCGrayLineColor4 = 0x40000000;

        /// <summary>
        /// 按钮未选中状态 0xFF656565;