From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100755
new mode 100644
index cd8dc23..c3e834f
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -35,6 +35,7 @@
public uint XMGray1 = 0xff232323;
public uint XMGray2 = 0xff666666;
public uint XMGray3 = 0xff999999;
+ public uint XMGray4 = 0xffcccccc;
public uint XMOrange = 0xfffc744b;
public uint XMVerticalSeekBar = 0xffececec;
public uint XMDel = 0xffF75858;
@@ -84,14 +85,14 @@
/// 瀛椾綋娴呰壊 0xFFCBCACA
/// </summary>
public uint GXCTextGrayColor3 = 0xFFCBCACA;
- /// <summary>
- /// 瀛椾綋娴呰壊 0xFF666666
- /// </summary>
- public uint GXCTextGrayColor4 = 0xFF666666;
- /// <summary>
- /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
- /// </summary>
- public uint GXCTextSelectedColor = 0xFFFC744B;
+ /// <summary>
+ /// 瀛椾綋娴呰壊 0xFF666666
+ /// </summary>
+ public uint GXCTextGrayColor4 = 0xFF666666;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
+ /// </summary>
+ public uint GXCTextSelectedColor = 0xFFFC744B;
/// <summary>
/// 瀛椾綋閫変腑棰滆壊 0xFFFB744A
/// </summary>
@@ -100,6 +101,10 @@
/// 瀛椾綋閫変腑棰滆壊 0xFFFFB400
/// </summary>
public uint GXCTextSelectedColor3 = 0xFFFFB400;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFF0075FF
+ /// </summary>
+ public uint GXCTextSelectedColor4 = 0xFF0075FF;
/// <summary>
/// 搴曢儴鏈�変腑棰滆壊 0xFF8E8E93
/// </summary>
@@ -120,6 +125,10 @@
/// 榛戣壊鑳屾櫙 0xFF333333
/// </summary>
public uint GXCBlackBackgroundColor2 = 0xFF333333;
+ /// <summary>
+ /// 榛戣壊鑳屾櫙 0xF2232323
+ /// </summary>
+ public uint GXCBlackBackgroundColor3 = 0xF2232323;
/// <summary>
/// functionView 0x1AFC744B
/// </summary>
@@ -177,6 +186,11 @@
/// </summary>
public uint GXCGrayLineColor2 = 0x66CCCCCC;
/// <summary>
+ /// 娴呰壊绾挎潯 0xFFB7B8BB
+ /// </summary>
+ public uint GXCGrayLineColor3 = 0xFFB7B8BB;
+
+ /// <summary>
/// 鎸夐挳鏈�変腑鐘舵�� 0xFF656565;
/// </summary>
public uint GXCButtonUnSelectedColor = 0xFF656565;
@@ -228,25 +242,33 @@
/// GXCWaveSeekBarColor 0xFFFE4F35
/// </summary>
public uint GXCWaveSeekBarColor = 0xFFFE4F35;
+ /// <summary>
+ /// 0xFFFDB500
+ /// </summary>
+ public uint GXCProgressColor = 0xFFFDB500;
+ /// <summary>
+ /// 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 GXCTextUnselectedColor = 0xFFD5D6D7;
+
+
public uint GXCSelectedColor = 0xFFFE5E00;//閫変腑棰滆壊
public uint GXCButtonhardWhiteColor = 0xFFE0E0E0;//鎴块棿btn鍗婇�忔槑鑳屾櫙鑹�
-
+
/// <summary>
/// 30%閫忔槑搴﹂粦鑹�
/// </summary>
@@ -284,6 +306,32 @@
public uint LogicEditBlackColor = 0xFF00aaf0;
public uint LogicTimeViewColor= 0xFFFFFFFF;
public uint LogicTimeViewSaveButton = 0xFF121212;
+ //鏈�鏂癠I棰滆壊
+ 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
}
}
--
Gitblit v1.8.0