From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 12 十月 2019 15:45:10 +0800
Subject: [PATCH] 合并门锁，完成住宅管理
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 138 ++++++++++++++++------------------------------
1 files changed, 48 insertions(+), 90 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 41288ba..cd8dc23 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -25,76 +25,25 @@
public uint ButtonColor = 0xffEAEAEA;
public uint SelectedColor = 0xFF00AAF0;
public uint DelRowLayout = 0xffff0000;
-
- //浠ヤ笅鏄祴璇曢鑹诧紝姝ｅ紡鏃堕渶瑕佸幓鎺�
- public uint MainPageBackgroucnd = 0xff00ff00;
- public uint TitleLayout = 0xff6b6b6b;
- public uint TitleText = 0xFFf2f2f2;
- public uint ViewColor = 0xFF3c3c3c;
- public uint TopLayout = 0xff6b6b6b;
- public uint UnderTopLayout = 0xFFb6b6b6;
- public uint MiddleLayout = 0xFFc9c9c9;
- public uint BottomLayout = 0xFF8a8a8a;
public uint TextBlack = 0xFF1F1F1F;
- public uint TextWhite = 0xFF1F1F1F;
- public uint PlaceholderTextColor = 0xFF505050;
- public uint RowLine = 0xFF9d9d9d;
- public uint RowLayout = 0xffa1a1a1;
- public uint ButtonBackGround = 0xff9fba4e;
- public uint SelectedButtonBackGround = 0xff00ff00;
-
- public uint BorderColor = 0xFF505050;
-
- public uint Transparent = 0xFF0000ff;
- public uint TitileView = 0xFF0f0f0f;
- public uint PanelSettingTargetNotInLocalColor = 0xCCF8E725;
- public uint Black50Transparent = 0x73000000;
- public uint White20Transparent = 0x35FFFFFF;
-
- public uint SubtitleView = 0xFF505050;
- public uint TextColor1 = 0xFFFFFFFF;
- public uint newDeviceBG = 0x801DB585;
- public uint LostDeviceBG = 0x80E26464;
- public uint UserMenuItemButton = 0xFF000000;
- public uint LineColor = 0xFF0f0f0f;
- public uint LightDialogTextColor = 0xFFE6E6E6;
- public uint ThumbColor = 0xFFFFFFFF;
- public uint LineColor2 = 0xFF5F5F5F;
- public uint ButtonColor1 = 0xFF505050;
- public uint SysTitleView = 0xFF0f0f0f;
- public uint SysSubtitleView = 0xFF2d2d2d;
- public uint SysEditBox = 0xFF505050;
- public uint SysPanelBox = 0xFF505050;
- public uint SysPanleDevicesBox = 0xFF3c3c3c;
- public uint SensorContentView = 0xFF505050;
- public uint TextColor2 = 0xFFFFFFFF;
- public uint DialogTextColor = 0xFFFFFFFF;
- public uint SceneDialogColor = 0xFF505050;
- public uint SceneDialogTitleColor = 0xFF0f0f0f;
- public uint DelColor = 0xFFFF0000;
- public uint SensorLevel0 = 0xFFFFFFFF;
- public uint SensorLevel1 = 0xFF6cc0fb;
- public uint SensorLevel2 = 0xFF6aeaa9;
- public uint SensorLevel3 = 0xFFff9a50;
- public uint SensorLevel4 = 0xFFff5757;
- public uint AddTipButtonColor = 0xFF000000;
- public uint MusicTopFrameLayout = 0xFF1F1F1F;
- public uint MusicVerticalScrolViewLayout = 0xff2F2F2F;
- public uint MusicPalyerView = 0xFF181818;
- public uint MusicTextColor = 0xFFFFFFFF;
- public uint MusicArtistTextColor = 0x80ffffff;
- public uint MusicLineColor = 0xFF181818;
- public uint MusicEditTextBackgroundColor = 0xFF4D4D4D;
- public uint MusicEditTextPlaceholderTextColor = 0x80ffffff;
- public uint MusicMiddleBackgroundColor = 0xFF121212;
- public uint MusicEditBorderColor = 0x00000000;
- public uint MusicTipBackgroundColor = 0xffcccccc;
- public uint MusicTipTextColor = 0xff000000;
- public uint MusicselecteButtonColcor = 0xff525252;
- public uint MusicDialogBackgroundColor = 0xFF484848;
- public uint HorizontalSeekBarThumbColor = 0xFFFFFFFF;
- public uint TimeVerticalScrolViewLayout = 0xff121212;
+ public uint XMTopFrameLayout = 0xfff9f9f9;
+ public uint XMTopTitleText = 0xff333333;
+ public uint XMMidFrameLayout = 0xfff5f6fa;
+ public uint XMWhite = 0xffffffff;
+ public uint XMBlack = 0xff000000;
+ public uint XMGray1 = 0xff232323;
+ public uint XMGray2 = 0xff666666;
+ public uint XMGray3 = 0xff999999;
+ public uint XMOrange = 0xfffc744b;
+ public uint XMVerticalSeekBar = 0xffececec;
+ public uint XMDel = 0xffF75858;
+ public uint XMUnSelect = 0x4d232323;
+ public uint XMBorder = 0xff676767;
+ //闃村奖
+ public uint XMTitleLine = 0x40000000;
+ public uint XMInVisibleLine = 0x00000000;
+ public uint XMRowLine = 0x66CCCCCC;
#endregion
@@ -135,10 +84,22 @@
/// 瀛椾綋娴呰壊 0xFFCBCACA
/// </summary>
public uint GXCTextGrayColor3 = 0xFFCBCACA;
+ /// <summary>
+ /// 瀛椾綋娴呰壊 0xFF666666
+ /// </summary>
+ public uint GXCTextGrayColor4 = 0xFF666666;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
+ /// </summary>
+ public uint GXCTextSelectedColor = 0xFFFC744B;
/// <summary>
- /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
+ /// 瀛椾綋閫変腑棰滆壊 0xFFFB744A
/// </summary>
- public uint GXCTextSelectedColor = 0xFFFC744B;
+ public uint GXCTextSelectedColor2 = 0xFFFB744A;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFFFFB400
+ /// </summary>
+ public uint GXCTextSelectedColor3 = 0xFFFFB400;
/// <summary>
/// 搴曢儴鏈�変腑棰滆壊 0xFF8E8E93
/// </summary>
@@ -159,6 +120,14 @@
/// 榛戣壊鑳屾櫙 0xFF333333
/// </summary>
public uint GXCBlackBackgroundColor2 = 0xFF333333;
+ /// <summary>
+ /// functionView 0x1AFC744B
+ /// </summary>
+ public uint GXCForFunctionUnSelectedBackgroundColor = 0x1AFC744B;
+ /// <summary>
+ /// functionView 0xFFFC744B
+ /// </summary>
+ public uint GXCForFunctionBackgroundColor = 0xFFFC744B;
/// <summary>
/// 0xFFFEF1ED
/// </summary>
@@ -234,7 +203,7 @@
/// <summary>
/// topview color 0xD1F8F8F8
/// </summary>
- public uint GXCTopViewBackgroundColor = 0xD1F8F8F8;
+ public uint GXCTopViewBackgroundColor = 0xFFF9F9F9;
/// <summary>
/// title color 0xFF030303
/// </summary>
@@ -251,7 +220,14 @@
/// 搴曢儴绾挎潯棰滆壊 0xFFBABABA
/// </summary>
public uint GXCBottomLineColor = 0xFFBABABA;
-
+ /// <summary>
+ /// GXCWaveSeekBarUnSelectedColor 0xFFEBEBED
+ /// </summary>
+ public uint GXCWaveSeekBarUnSelectedColor = 0xFFEBEBED;
+ /// <summary>
+ /// GXCWaveSeekBarColor 0xFFFE4F35
+ /// </summary>
+ public uint GXCWaveSeekBarColor = 0xFFFE4F35;
@@ -309,23 +285,5 @@
public uint LogicTimeViewColor= 0xFFFFFFFF;
public uint LogicTimeViewSaveButton = 0xFF121212;
#endregion
-
- public uint XMTopFrameLayout = 0xfff9f9f9;
- public uint XMTopTitleText = 0xff333333;
- public uint XMMidFrameLayout = 0xfff5f6fa;
- public uint XMWhite = 0xffffffff;
- public uint XMBlack = 0xff000000;
- public uint XMGray1 = 0xff232323;
- public uint XMGray2 = 0xff666666;
- public uint XMGray3 = 0xff999999;
- public uint XMOrange = 0xfffc744b;
- public uint XMVerticalSeekBar = 0xffececec;
- public uint XMDel = 0xffF75858;
- public uint XMUnSelect = 0x4d232323;
-
- //闃村奖
- public uint XMTitleLine = 0x40000000;
- public uint XMInVisibleLine = 0x00000000;
- public uint XMRowLine = 0x66CCCCCC;
}
}
--
Gitblit v1.8.0