From ff3cfcf62632bf43e51a6b6098c203bf0f5cddbc Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 19:53:29 +0800
Subject: [PATCH] 2019.12.24
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 83 +++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100755
new mode 100644
index 1b07814..a6d86ee
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -11,7 +11,7 @@
}
public static ZigbeeColor Current;
-
+
#region 寰愭
public uint MainColor = 0xFFEAEAEA;
public uint BottomMenuColor = 0xFFFFFFFF;
@@ -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>
@@ -116,6 +117,10 @@
/// 娴呯櫧鑳屾櫙 0xFFF5F6FA
/// </summary>
public uint GXCGrayBackgroundColor = 0xFFF5F6FA;
+ /// <summary>
+ /// 0x73000000
+ /// </summary>
+ public uint GXCGrayBackgroundColor2 = 0x73000000;
/// <summary>
/// 榛戣壊鑳屾櫙 0xFF232323
/// </summary>
@@ -185,6 +190,11 @@
/// </summary>
public uint GXCGrayLineColor2 = 0x66CCCCCC;
/// <summary>
+ /// 娴呰壊绾挎潯 0xFFB7B8BB
+ /// </summary>
+ public uint GXCGrayLineColor3 = 0xFFB7B8BB;
+
+ /// <summary>
/// 鎸夐挳鏈�変腑鐘舵�� 0xFF656565;
/// </summary>
public uint GXCButtonUnSelectedColor = 0xFF656565;
@@ -236,48 +246,31 @@
/// GXCWaveSeekBarColor 0xFFFE4F35
/// </summary>
public uint GXCWaveSeekBarColor = 0xFFFE4F35;
-
-
-
-
- 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%閫忔槑搴﹂粦鑹�
+ /// 0xFFFDB500
/// </summary>
- public uint GXCBlack70Color = 0x4C000000;
+ public uint GXCProgressColor = 0xFFFDB500;
/// <summary>
- /// 20%閫忔槑搴﹂粦鑹�
+ /// 0xFFF5F5F5
/// </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;
+ public uint GXCSeekBarBackground = 0xFFF5F5F5;
/// <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瀹氫箟鐨勯鑹�--
@@ -291,7 +284,7 @@
public uint LogicDelBackgroundColor = 0xFFFF0000;
public uint LogicEditBlackColor = 0xFF00aaf0;
public uint LogicTimeViewColor = 0xFFFFFFFF;
- public uint LogicTimeViewSaveButton = 0xFF121212;
+ public uint LogicTimeViewSaveButton = 0xFF121212;
//鏈�鏂癠I棰滆壊
public uint LogicTopBackgroundColor = 0xFFF9F9F9;
public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;
@@ -320,4 +313,4 @@
#endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0