From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
old mode 100755
new mode 100644
index 3bc8bd6..1551afc
--- 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;
@@ -299,8 +299,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;
@@ -329,4 +329,4 @@
#endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0