合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -254,48 +254,23 @@
        /// 0xFFF5F5F5
        /// </summary>
        public uint GXCSeekBarBackground = 0xFFF5F5F5;




        public uint GXCTextBlueColor = 0xFF00AAF0;



        public uint GXCBorderRedColor = 0xFFF44D4D;


        public uint GXCButtonBlueColor = 0xFF00AAF0;
        public uint GXCButtonUnselectedColor = 0xFFAAAAAA;
        public uint GXCTextUnselectedColor = 0xFFD5D6D7;


        public uint GXCSelectedColor = 0xFFFE5E00;//选中颜色
        public uint GXCButtonhardWhiteColor = 0xFFE0E0E0;//房间btn半透明背景色

        /// <summary>
        /// 30%透明度黑色
        /// </summary>
        public uint GXCBlack70Color = 0x4C000000;
        /// <summary>
        /// 20%透明度黑色
        /// </summary>
        public uint GXCBlack80Color = 0x33000000;
        public uint GXCButtonTipColor = 0xFF999999;//浅色字提示
        public uint GXCTransparent = 0x00FFFFFF;
        /// <summary>
        /// 滑条未选择中颜色--7C7C7C ->0xffadadad
        /// </summary>
        public uint GXCSliderUnSelectedColor = 0xffadadad;
        public uint GXCEditorBGColor = 0xFF32B4C8;
        /// <summary>
        /// 取消收藏颜色--999999
        /// </summary>
        public uint GXCCancelCollectionBGColor = 0xFF999999;
        /// <summary>
        /// 用于空调的选中文字颜色
        /// </summary>
        public uint GXCACSelectedTextColor = 0xFF99D619;
        /// <summary>
        /// 开始颜色
        /// </summary>
        public uint GXCArcScaleSeekBarStartColor = 0xFF495AF4;
        /// <summary>
        /// 结束颜色
        /// </summary>
        public uint GXCArcScaleSeekBarEndColor = 0xFFAE50A8;



        public uint GXCButtonBlueColor = 0xFF00AAF0;
     
        #endregion

        #region --Logic定义的颜色--