From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 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..04dc6e7
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -84,14 +84,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 +100,10 @@
/// 瀛椾綋閫変腑棰滆壊 0xFFFFB400
/// </summary>
public uint GXCTextSelectedColor3 = 0xFFFFB400;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFF0075FF
+ /// </summary>
+ public uint GXCTextSelectedColor4 = 0xFF0075FF;
/// <summary>
/// 搴曢儴鏈�変腑棰滆壊 0xFF8E8E93
/// </summary>
@@ -120,6 +124,10 @@
/// 榛戣壊鑳屾櫙 0xFF333333
/// </summary>
public uint GXCBlackBackgroundColor2 = 0xFF333333;
+ /// <summary>
+ /// 榛戣壊鑳屾櫙 0xF2232323
+ /// </summary>
+ public uint GXCBlackBackgroundColor3 = 0xF2232323;
/// <summary>
/// functionView 0x1AFC744B
/// </summary>
@@ -228,25 +236,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>
--
Gitblit v1.8.0