From d6b4e510f1430d19bc48da6894cf707bbe3c226d Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 14:25:15 +0800
Subject: [PATCH] 2019.10.29-2

---
 ZigbeeApp/Shared/Common/ZigbeeColor.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100755
new mode 100644
index b05ebc5..8dff9b7
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -35,7 +35,6 @@
         public uint XMGray1 = 0xff232323;
         public uint XMGray2 = 0xff666666;
         public uint XMGray3 = 0xff999999;
-        public uint XMGray4 = 0xffcccccc;
         public uint XMOrange = 0xfffc744b;
         public uint XMVerticalSeekBar = 0xffececec;
         public uint XMDel = 0xffF75858;
@@ -237,6 +236,14 @@
         /// GXCWaveSeekBarColor 0xFFFE4F35
         /// </summary>
         public uint GXCWaveSeekBarColor = 0xFFFE4F35;
+        /// <summary>
+        /// 0xFFFDB500
+        /// </summary>
+        public uint GXCProgressColor = 0xFFFDB500;
+        /// <summary>
+        /// 0xFFF5F5F5
+        /// </summary>
+        public uint GXCSeekBarBackground = 0xFFF5F5F5;
 
 
 
@@ -291,8 +298,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