From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 002ca22..79b9ea8 100644
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -251,9 +251,13 @@
/// </summary>
public uint GXCWaveSeekBarUnSelectedColor = 0xFFEBEBED;
/// <summary>
- /// GXCWaveSeekBarColor 0xFFFE4F35
+ /// GXCWaveSeekBarColor_Start 0xFFFF6C2C
/// </summary>
- public uint GXCWaveSeekBarColor = 0xFFFE4F35;
+ public uint GXCWaveSeekBarColor_Start = 0xFFFF6C2C;
+ /// <summary>
+ /// GXCWaveSeekBarColor_End 0xFFFD3040
+ /// </summary>
+ public uint GXCWaveSeekBarColor_End = 0xFFFD3040;
/// <summary>
/// 0xFFFDB500
/// </summary>
@@ -263,22 +267,47 @@
/// </summary>
public uint GXCSeekBarBackground = 0xFFF5F5F5;
/// <summary>
- /// 鐢ㄤ簬绌鸿皟鐨勯�変腑鏂囧瓧棰滆壊
+ /// 鐢ㄤ簬绌鸿皟椋庨�熺殑閫変腑鏂囧瓧棰滆壊
+ /// 0xFF99D619
/// </summary>
- public uint GXCACSelectedTextColor = 0xFF99D619;
+ public uint GXCACSelectedTextColor_FanModel = 0xFF99D619;
/// <summary>
- /// 寮�濮嬮鑹�
+ /// 鐢ㄤ簬绌鸿皟鎵鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFF8162FE
+ /// </summary>
+ public uint GXCACSelectedTextColor2 = 0xFF8162FE;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFF445BF9
+ /// </summary>
+ public uint GXCACSelectedTextColor_Cool = 0xFF445BF9;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFFFB744A
+ /// </summary>
+ public uint GXCACSelectedTextColor_Heat = 0xFFFB744A;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFFFFB400
+ /// </summary>
+ public uint GXCACSelectedTextColor_Dry = 0xFFFFB400;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFF99D619
+ /// </summary>
+ public uint GXCACSelectedTextColor_Fan = 0xFF99D619;
+
+ /// <summary>
+ /// 寮�濮嬮鑹� 0xFF495AF4
/// </summary>
public uint GXCArcScaleSeekBarStartColor = 0xFF495AF4;
/// <summary>
- /// 缁撴潫棰滆壊
+ /// 缁撴潫棰滆壊 0xFFAE50A8
/// </summary>
public uint GXCArcScaleSeekBarEndColor = 0xFFAE50A8;
-
-
public uint GXCButtonBlueColor = 0xFF00AAF0;
-
+
#endregion
#region --Logic瀹氫箟鐨勯鑹�--
@@ -292,7 +321,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;
@@ -321,4 +350,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0