From 427d1c7ecd04b03419eae157e32fe3367d8dffea Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 28 十一月 2019 09:53:25 +0800
Subject: [PATCH] 2019.11.28

---
 ZigbeeApp/Shared/Common/ZigbeeColor.cs |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100755
new mode 100644
index b05ebc5..bdaeb8d
--- 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;
@@ -186,6 +186,11 @@
         /// </summary>
         public uint GXCGrayLineColor2 = 0x66CCCCCC;
         /// <summary>
+        /// 娴呰壊绾挎潯 0xFFB7B8BB
+        /// </summary>
+        public uint GXCGrayLineColor3 = 0xFFB7B8BB;
+
+        /// <summary>
         /// 鎸夐挳鏈�変腑鐘舵�� 0xFF656565;
         /// </summary>
         public uint GXCButtonUnSelectedColor = 0xFF656565;
@@ -237,6 +242,14 @@
         /// GXCWaveSeekBarColor 0xFFFE4F35
         /// </summary>
         public uint GXCWaveSeekBarColor = 0xFFFE4F35;
+        /// <summary>
+        /// 0xFFFDB500
+        /// </summary>
+        public uint GXCProgressColor = 0xFFFDB500;
+        /// <summary>
+        /// 0xFFF5F5F5
+        /// </summary>
+        public uint GXCSeekBarBackground = 0xFFF5F5F5;
 
 
 
@@ -291,8 +304,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;
@@ -321,4 +334,4 @@
 
         #endregion
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0