From 1f4cec0e3b571e7541f0c7f3a5ea302ed586d9fb Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 16:47:06 +0800
Subject: [PATCH] 2019-10-24-5

---
 ZigbeeApp/Shared/Common/ZigbeeColor.cs |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100644
new mode 100755
index 5074a9e..b05ebc5
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -11,10 +11,11 @@
         }
 
         public static ZigbeeColor Current;
-
+       
         #region 寰愭
         public uint MainColor = 0xFFEAEAEA;
         public uint BottomMenuColor = 0xFFFFFFFF;
+
         public uint SelectedTextColor = 0xFF238BCB;
         public uint TextColor = 0xFF000000;
         public uint DialogColor = 0xFFFFFFFF;
@@ -84,14 +85,14 @@
         /// 瀛椾綋娴呰壊 0xFFCBCACA
         /// </summary>
         public uint GXCTextGrayColor3 = 0xFFCBCACA;
-		/// <summary>
-		/// 瀛椾綋娴呰壊 0xFF666666
-		/// </summary>
-		public uint GXCTextGrayColor4 = 0xFF666666;
-		/// <summary>
-		/// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
-		/// </summary>
-		public uint GXCTextSelectedColor = 0xFFFC744B;
+        /// <summary>
+        /// 瀛椾綋娴呰壊 0xFF666666
+        /// </summary>
+        public uint GXCTextGrayColor4 = 0xFF666666;
+        /// <summary>
+        /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
+        /// </summary>
+        public uint GXCTextSelectedColor = 0xFFFC744B;
         /// <summary>
         /// 瀛椾綋閫変腑棰滆壊 0xFFFB744A
         /// </summary>
@@ -100,6 +101,10 @@
         /// 瀛椾綋閫変腑棰滆壊 0xFFFFB400
         /// </summary>
         public uint GXCTextSelectedColor3 = 0xFFFFB400;
+        /// <summary>
+        /// 瀛椾綋閫変腑棰滆壊 0xFF0075FF
+        /// </summary>
+        public uint GXCTextSelectedColor4 = 0xFF0075FF;
         /// <summary>
         /// 搴曢儴鏈�変腑棰滆壊 0xFF8E8E93
         /// </summary>
@@ -120,6 +125,10 @@
         /// 榛戣壊鑳屾櫙 0xFF333333
         /// </summary>
         public uint GXCBlackBackgroundColor2 = 0xFF333333;
+        /// <summary>
+        /// 榛戣壊鑳屾櫙 0xF2232323
+        /// </summary>
+        public uint GXCBlackBackgroundColor3 = 0xF2232323;
         /// <summary>
         /// functionView 0x1AFC744B
         /// </summary>
@@ -233,20 +242,20 @@
 
 
         public uint GXCTextBlueColor = 0xFF00AAF0;
-        
-       
-        
+
+
+
         public uint GXCBorderRedColor = 0xFFF44D4D;
 
 
         public uint GXCButtonBlueColor = 0xFF00AAF0;
         public uint GXCButtonUnselectedColor = 0xFFAAAAAA;
-        public uint GXCTextUnselectedColor= 0xFFD5D6D7;
-       
-  
+        public uint GXCTextUnselectedColor = 0xFFD5D6D7;
+
+
         public uint GXCSelectedColor = 0xFFFE5E00;//閫変腑棰滆壊
         public uint GXCButtonhardWhiteColor = 0xFFE0E0E0;//鎴块棿btn鍗婇�忔槑鑳屾櫙鑹�
-       
+
         /// <summary>
         /// 30%閫忔槑搴﹂粦鑹�
         /// </summary>
@@ -282,8 +291,8 @@
         public uint LogicTextBlueColor = 0xFF00AAF0;
         public uint LogicDelBackgroundColor = 0xFFFF0000;
         public uint LogicEditBlackColor = 0xFF00aaf0;
-        public uint LogicTimeViewColor = 0xFFFFFFFF;
-        public uint LogicTimeViewSaveButton = 0xFF121212;
+        public uint LogicTimeViewColor= 0xFFFFFFFF;
+        public uint LogicTimeViewSaveButton = 0xFF121212;
         //鏈�鏂癠I棰滆壊
         public uint LogicTopBackgroundColor = 0xFFF9F9F9;
         public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;

--
Gitblit v1.8.0