From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 190 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 137 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index cd8dc23..7086938 100755
--- 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;
@@ -35,6 +35,7 @@
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;
@@ -44,6 +45,24 @@
public uint XMTitleLine = 0x40000000;
public uint XMInVisibleLine = 0x00000000;
public uint XMRowLine = 0x66CCCCCC;
+ /// <summary>
+ /// 0xFFECECEC
+ /// </summary>
+ public uint XMSeekBarBackgroundColor = 0xFFECECEC;
+ /// <summary>
+ /// 0xFF232323
+ /// </summary>
+ public uint XMProgressBarColor = 0xFF232323;
+ /// <summary>
+ /// 0xFFF5F6FA
+ /// </summary>
+ public uint XMPEditTextBackground = 0xFFF5F6FA;
+ /// <summary>
+ /// 0xFFF5F6FA
+ /// </summary>
+ public uint XMAlarmText = 0xFFF75858;
+
+
#endregion
@@ -84,14 +103,14 @@
/// 瀛椾綋娴呰壊 0xFFCBCACA
/// </summary>
public uint GXCTextGrayColor3 = 0xFFCBCACA;
- /// <summary>
- /// 瀛椾綋娴呰壊 0xFF666666
- /// </summary>
- public uint GXCTextGrayColor4 = 0xFF666666;
- /// <summary>
- /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
- /// </summary>
- public uint GXCTextSelectedColor = 0xFFFC744B;
+ /// <summary>
+ /// 瀛椾綋娴呰壊 0xFF666666
+ /// </summary>
+ public uint GXCTextGrayColor4 = 0xFF666666;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFFFC744B
+ /// </summary>
+ public uint GXCTextSelectedColor = 0xFFFC744B;
/// <summary>
/// 瀛椾綋閫変腑棰滆壊 0xFFFB744A
/// </summary>
@@ -100,6 +119,10 @@
/// 瀛椾綋閫変腑棰滆壊 0xFFFFB400
/// </summary>
public uint GXCTextSelectedColor3 = 0xFFFFB400;
+ /// <summary>
+ /// 瀛椾綋閫変腑棰滆壊 0xFF0075FF
+ /// </summary>
+ public uint GXCTextSelectedColor4 = 0xFF0075FF;
/// <summary>
/// 搴曢儴鏈�変腑棰滆壊 0xFF8E8E93
/// </summary>
@@ -113,6 +136,10 @@
/// </summary>
public uint GXCGrayBackgroundColor = 0xFFF5F6FA;
/// <summary>
+ /// 0x73000000
+ /// </summary>
+ public uint GXCGrayBackgroundColor2 = 0x73000000;
+ /// <summary>
/// 榛戣壊鑳屾櫙 0xFF232323
/// </summary>
public uint GXCBlackBackgroundColor = 0xFF232323;
@@ -120,6 +147,10 @@
/// 榛戣壊鑳屾櫙 0xFF333333
/// </summary>
public uint GXCBlackBackgroundColor2 = 0xFF333333;
+ /// <summary>
+ /// 榛戣壊鑳屾櫙 0xF2232323
+ /// </summary>
+ public uint GXCBlackBackgroundColor3 = 0xF2232323;
/// <summary>
/// functionView 0x1AFC744B
/// </summary>
@@ -169,13 +200,26 @@
/// </summary>
public uint GXCSelectedLineColor = 0xFFFC744B;
/// <summary>
- /// 娴呰壊绾挎潯 0xFFF5F6FA;
+ /// 娴呰壊绾挎潯 0x80CCCCCC
/// </summary>
- public uint GXCGrayLineColor = 0xFFF5F6FA;
+ public uint GXCGrayLineColor = 0x80CCCCCC;
/// <summary>
/// 娴呰壊绾挎潯 0x66CCCCCC
/// </summary>
public uint GXCGrayLineColor2 = 0x66CCCCCC;
+ ///// <summary>
+ ///// 娴呰壊绾挎潯 0xFFEBEBEB
+ ///// </summary>
+ //public uint GXCGrayLineColor2 = 0xFFEBEBEB;
+ /// <summary>
+ /// 娴呰壊绾挎潯 0xFFB7B8BB
+ /// </summary>
+ public uint GXCGrayLineColor3 = 0xFFB7B8BB;
+ /// <summary>
+ /// 0x40000000
+ /// </summary>
+ public uint GXCGrayLineColor4 = 0x40000000;
+
/// <summary>
/// 鎸夐挳鏈�変腑鐘舵�� 0xFF656565;
/// </summary>
@@ -225,51 +269,63 @@
/// </summary>
public uint GXCWaveSeekBarUnSelectedColor = 0xFFEBEBED;
/// <summary>
- /// GXCWaveSeekBarColor 0xFFFE4F35
+ /// GXCWaveSeekBarColor_Start 0xFFFF6C2C
/// </summary>
- public uint GXCWaveSeekBarColor = 0xFFFE4F35;
+ public uint GXCWaveSeekBarColor_Start = 0xFFFF6C2C;
+ /// <summary>
+ /// GXCWaveSeekBarColor_End 0xFFFD3040
+ /// </summary>
+ public uint GXCWaveSeekBarColor_End = 0xFFFD3040;
+ /// <summary>
+ /// 0xFFFDB500
+ /// </summary>
+ public uint GXCProgressColor = 0xFFFDB500;
+ /// <summary>
+ /// 0xFFF5F5F5
+ /// </summary>
+ public uint GXCSeekBarBackground = 0xFFF5F5F5;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟椋庨�熺殑閫変腑鏂囧瓧棰滆壊
+ /// 0xFF99D619
+ /// </summary>
+ public uint GXCACSelectedTextColor_FanModel = 0xFF99D619;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟鎵鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFF8162FE
+ /// </summary>
+ public uint GXCACSelectedTextColor2 = 0xFF8162FE;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFF445BF9
+ /// </summary>
+ public uint GXCACSelectedTextColor_Cool = 0xFF445BF9;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFFFB744A
+ /// </summary>
+ public uint GXCACSelectedTextColor_Heat = 0xFFFB744A;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFFFFB400
+ /// </summary>
+ public uint GXCACSelectedTextColor_Dry = 0xFFFFB400;
+ /// <summary>
+ /// 鐢ㄤ簬绌鸿皟妯″紡鐨勯�変腑鏂囧瓧棰滆壊
+ /// 0xFF99D619
+ /// </summary>
+ public uint GXCACSelectedTextColor_Fan = 0xFF99D619;
-
-
-
- public uint GXCTextBlueColor = 0xFF00AAF0;
-
-
-
- public uint GXCBorderRedColor = 0xFFF44D4D;
-
+ /// <summary>
+ /// 寮�濮嬮鑹� 0xFF495AF4
+ /// </summary>
+ public uint GXCArcScaleSeekBarStartColor = 0xFF495AF4;
+ /// <summary>
+ /// 缁撴潫棰滆壊 0xFFAE50A8
+ /// </summary>
+ public uint GXCArcScaleSeekBarEndColor = 0xFFAE50A8;
public uint GXCButtonBlueColor = 0xFF00AAF0;
- public uint GXCButtonUnselectedColor = 0xFFAAAAAA;
- public uint GXCTextUnselectedColor= 0xFFD5D6D7;
-
-
- public uint GXCSelectedColor = 0xFFFE5E00;//閫変腑棰滆壊
- public uint GXCButtonhardWhiteColor = 0xFFE0E0E0;//鎴块棿btn鍗婇�忔槑鑳屾櫙鑹�
-
- /// <summary>
- /// 30%閫忔槑搴﹂粦鑹�
- /// </summary>
- public uint GXCBlack70Color = 0x4C000000;
- /// <summary>
- /// 20%閫忔槑搴﹂粦鑹�
- /// </summary>
- public uint GXCBlack80Color = 0x33000000;
- public uint GXCButtonTipColor = 0xFF999999;//娴呰壊瀛楁彁绀�
- public uint GXCTransparent = 0x00FFFFFF;
- /// <summary>
- /// 婊戞潯鏈�夋嫨涓鑹�--7C7C7C ->0xffadadad
- /// </summary>
- public uint GXCSliderUnSelectedColor = 0xffadadad;
- public uint GXCEditorBGColor = 0xFF32B4C8;
- /// <summary>
- /// 鍙栨秷鏀惰棌棰滆壊--999999
- /// </summary>
- public uint GXCCancelCollectionBGColor = 0xFF999999;
- /// <summary>
- /// 鐢ㄤ簬绌鸿皟鐨勯�変腑鏂囧瓧棰滆壊
- /// </summary>
- public uint GXCACSelectedTextColor = 0xFF99D619;
+
#endregion
#region --Logic瀹氫箟鐨勯鑹�--
@@ -282,8 +338,36 @@
public uint LogicTextBlueColor = 0xFF00AAF0;
public uint LogicDelBackgroundColor = 0xFFFF0000;
public uint LogicEditBlackColor = 0xFF00aaf0;
- public uint LogicTimeViewColor= 0xFFFFFFFF;
+ 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;
+ public uint LogicTipColor = 0xFF333443;
+ public uint LogicTipTextColor= 0xFFcccccc;
+ public uint LogicEditTextBackgroundColor=0xFFD1D1D3;
#endregion
}
}
--
Gitblit v1.8.0