首次合并了全部的代码

黄学彪

2019-10-15 2bf5ec775cb57d8015bee58c745a1e48081ff1b1

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -101,6 +101,10 @@
        /// </summary>
        public uint GXCTextSelectedColor3 = 0xFFFFB400;
        /// <summary>
        /// 字体选中颜色 0xFF0075FF
        /// </summary>
        public uint GXCTextSelectedColor4 = 0xFF0075FF;
        /// <summary>
        /// 底部未选中颜色 0xFF8E8E93
        /// </summary>
        public uint GXCTextBottomUnSelectedColor = 0xFF8E8E93;
@@ -120,6 +124,10 @@
        /// 黑色背景 0xFF333333
        /// </summary>
        public uint GXCBlackBackgroundColor2 = 0xFF333333;
        /// <summary>
        /// 黑色背景 0xF2232323
        /// </summary>
        public uint GXCBlackBackgroundColor3 = 0xF2232323;
        /// <summary>
        /// functionView 0x1AFC744B
        /// </summary>
@@ -284,6 +292,32 @@
        public uint LogicEditBlackColor = 0xFF00aaf0;
        public uint LogicTimeViewColor= 0xFFFFFFFF;
        public uint LogicTimeViewSaveButton = 0xFF121212;

        //最新UI颜色
        public uint LogicTopBackgroundColor = 0xFFF9F9F9;
        public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;
        public uint LogicBlankBackgroundColor = 0xFFFFFFFF;
        public uint LogicRowLayoutLineColor = 0x40cccccc;
        public uint LogicRowLayoutTopLineColor = 0x25000000;
        public uint LogicBtnCancelColor = 0xFF999999;
        public uint LogicBtnTypeColor = 0xFF232323;
        public uint LogicBtnCompleteColor = 0xFFFB744A;
        public uint LogicBtnSelectedColor = 0xFF333333;
        public uint LogicBtnNotSelectedColor = 0xFF666666;
        public uint LogicBtnSaveBackgroundColor = 0xFF232323;
        public uint LogicBtnSaveTextColor = 0xFFFFFFFF;
        public uint LogicTranslucentColor = 0x50000000;
        public uint LogicAddColor = 0xFFFC744B;
        public uint LogicIconBackgroundColor = 0xFFFEF1ED;
        public uint LogicProgressColor = 0xFFE8E8E8;
        public uint LogicProgressColorSelected = 0xffFDB500;
        public uint LogicEditBlackColor1 = 0xFF4A4A4A;
        public uint LogicDelBlackColor1 = 0xFFF75858;
        public uint LogicFunction1Color = 0xFFFFa200;
        public uint LogicScene1Color = 0xFF4A90E2;
        public uint LogicSecurity1Color = 0xFF35B87F;
        public uint LogicDelay1Color = 0xFFBF64FB;
        public uint LogicListWeekTextColor = 0xFF666666;

        #endregion
    }
}