From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index ca272cd..7086938 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -45,6 +45,24 @@
public uint XMTitleLine = 0x40000000;
public uint XMInVisibleLine = 0x00000000;
public uint XMRowLine = 0x66CCCCCC;
+ /// <summary>
+ /// 0xFFECECEC
+ /// </summary>
+ public uint XMSeekBarBackgroundColor = 0xFFECECEC;
+ /// <summary>
+ /// 0xFF232323
+ /// </summary>
+ public uint XMProgressBarColor = 0xFF232323;
+ /// <summary>
+ /// 0xFFF5F6FA
+ /// </summary>
+ public uint XMPEditTextBackground = 0xFFF5F6FA;
+ /// <summary>
+ /// 0xFFF5F6FA
+ /// </summary>
+ public uint XMAlarmText = 0xFFF75858;
+
+
#endregion
@@ -251,9 +269,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 +285,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瀹氫箟鐨勯鑹�--
@@ -318,7 +365,9 @@
public uint LogicSecurity1Color = 0xFF35B87F;
public uint LogicDelay1Color = 0xFFBF64FB;
public uint LogicListWeekTextColor = 0xFF666666;
-
+ public uint LogicTipColor = 0xFF333443;
+ public uint LogicTipTextColor= 0xFFcccccc;
+ public uint LogicEditTextBackgroundColor=0xFFD1D1D3;
#endregion
}
}
--
Gitblit v1.8.0