From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index c3e834f..90baaca 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -11,7 +11,7 @@
}
public static ZigbeeColor Current;
-
+
#region 寰愭
public uint MainColor = 0xFFEAEAEA;
public uint BottomMenuColor = 0xFFFFFFFF;
@@ -117,6 +117,10 @@
/// 娴呯櫧鑳屾櫙 0xFFF5F6FA
/// </summary>
public uint GXCGrayBackgroundColor = 0xFFF5F6FA;
+ /// <summary>
+ /// 0x73000000
+ /// </summary>
+ public uint GXCGrayBackgroundColor2 = 0x73000000;
/// <summary>
/// 榛戣壊鑳屾櫙 0xFF232323
/// </summary>
@@ -304,7 +308,7 @@
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;
--
Gitblit v1.8.0