From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 9cf8886..ca272cd 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -182,17 +182,25 @@
/// </summary>
public uint GXCSelectedLineColor = 0xFFFC744B;
/// <summary>
- /// 娴呰壊绾挎潯 0xFFF5F6FA;
+ /// 娴呰壊绾挎潯 0x80CCCCCC
/// </summary>
- public uint GXCGrayLineColor = 0xFFF5F6FA;
+ public uint GXCGrayLineColor = 0x80CCCCCC;
/// <summary>
/// 娴呰壊绾挎潯 0x66CCCCCC
/// </summary>
public uint GXCGrayLineColor2 = 0x66CCCCCC;
+ ///// <summary>
+ ///// 娴呰壊绾挎潯 0xFFEBEBEB
+ ///// </summary>
+ //public uint GXCGrayLineColor2 = 0xFFEBEBEB;
/// <summary>
/// 娴呰壊绾挎潯 0xFFB7B8BB
/// </summary>
public uint GXCGrayLineColor3 = 0xFFB7B8BB;
+ /// <summary>
+ /// 0x40000000
+ /// </summary>
+ public uint GXCGrayLineColor4 = 0x40000000;
/// <summary>
/// 鎸夐挳鏈�変腑鐘舵�� 0xFF656565;
--
Gitblit v1.8.0