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 | 66 ++++++++++++---------------------
1 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100755
new mode 100644
index 1b07814..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>
@@ -236,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>
@@ -290,34 +298,8 @@
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;
- 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