From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 1b07814..3bc8bd6 100755
--- 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>
@@ -236,25 +237,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>
@@ -290,7 +299,7 @@
public uint LogicTextBlueColor = 0xFF00AAF0;
public uint LogicDelBackgroundColor = 0xFFFF0000;
public uint LogicEditBlackColor = 0xFF00aaf0;
- public uint LogicTimeViewColor = 0xFFFFFFFF;
+ public uint LogicTimeViewColor= 0xFFFFFFFF;
public uint LogicTimeViewSaveButton = 0xFF121212;
//鏈�鏂癠I棰滆壊
public uint LogicTopBackgroundColor = 0xFFF9F9F9;
--
Gitblit v1.8.0