From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 3bc8bd6..04dc6e7 100644
--- 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;
@@ -301,32 +300,6 @@
public uint LogicEditBlackColor = 0xFF00aaf0;
public uint LogicTimeViewColor= 0xFFFFFFFF;
public uint LogicTimeViewSaveButton = 0xFF121212;
- //鏈�鏂癠I棰滆壊
- public uint LogicTopBackgroundColor = 0xFFF9F9F9;
- public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;
- public uint LogicBlankBackgroundColor = 0xFFFFFFFF;
- public uint LogicRowLayoutLineColor = 0x40cccccc;
- public uint LogicRowLayoutTopLineColor = 0x25000000;
- public uint LogicBtnCancelColor = 0xFF999999;
- public uint LogicBtnTypeColor = 0xFF232323;
- public uint LogicBtnCompleteColor = 0xFFFB744A;
- public uint LogicBtnSelectedColor = 0xFF333333;
- public uint LogicBtnNotSelectedColor = 0xFF666666;
- public uint LogicBtnSaveBackgroundColor = 0xFF232323;
- public uint LogicBtnSaveTextColor = 0xFFFFFFFF;
- public uint LogicTranslucentColor = 0x50000000;
- public uint LogicAddColor = 0xFFFC744B;
- public uint LogicIconBackgroundColor = 0xFFFEF1ED;
- public uint LogicProgressColor = 0xFFE8E8E8;
- public uint LogicProgressColorSelected = 0xffFDB500;
- public uint LogicEditBlackColor1 = 0xFF4A4A4A;
- public uint LogicDelBlackColor1 = 0xFFF75858;
- public uint LogicFunction1Color = 0xFFFFa200;
- public uint LogicScene1Color = 0xFF4A90E2;
- public uint LogicSecurity1Color = 0xFF35B87F;
- public uint LogicDelay1Color = 0xFFBF64FB;
- public uint LogicListWeekTextColor = 0xFF666666;
-
#endregion
}
}
--
Gitblit v1.8.0