From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index ca272cd..794cfd8 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -263,22 +263,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瀹氫箟鐨勯鑹�--
--
Gitblit v1.8.0