From b129359c5a0df75f63d9131e5e41d3060ac38cc3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 30 十二月 2019 14:14:06 +0800
Subject: [PATCH] 2019.12.30
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 67 +++++++++++++--------------------
1 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index bdaeb8d..002ca22 100644
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -118,6 +118,10 @@
/// </summary>
public uint GXCGrayBackgroundColor = 0xFFF5F6FA;
/// <summary>
+ /// 0x73000000
+ /// </summary>
+ public uint GXCGrayBackgroundColor2 = 0x73000000;
+ /// <summary>
/// 榛戣壊鑳屾櫙 0xFF232323
/// </summary>
public uint GXCBlackBackgroundColor = 0xFF232323;
@@ -178,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;
@@ -250,48 +262,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瀹氫箟鐨勯鑹�--
--
Gitblit v1.8.0