From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs
old mode 100755
new mode 100644
index 42d802e..a5f200d
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs
@@ -55,102 +55,106 @@
/// <summary>
/// 鈽咮odyFrameLayout鐨勮儗鏅壊(0xfff5f6fa)
/// </summary>
- public uint BodyFrameLayout = 0xfff5f6fa;
+ public uint BodyFrameLayout = 0xfff5f6fa;
/// <summary>
/// 鈽嗘寜閽殑鍒濆鑳屾櫙鑹�(榛戣壊 0xff232323)
/// </summary>
- public uint ClickButtonDefultColor = 0xff232323;
+ public uint ClickButtonDefultColor = 0xff232323;
/// <summary>
/// 鈽嗘寜閽寜涓嬬姸鎬佺殑鑳屾櫙鑹�(鐏拌壊 0xff656565)
/// </summary>
- public uint ButtonClickStatuColor = 0xff656565;
+ public uint ButtonClickStatuColor = 0xff656565;
/// <summary>
/// 鈽嗙櫧鑹�,涓昏鐢ㄤ簬FrameLayout鐨勮儗鏅�(0xffffffff)
/// </summary>
- public uint White = 0xffffffff;
+ public uint White = 0xffffffff;
/// <summary>
/// 鈽嗛�忔槑(0x00000000)
/// </summary>
- public uint Transparent = 0x00000000;
+ public uint Transparent = 0x00000000;
/// <summary>
/// 鈽嗘甯告枃鏈瓧浣撻鑹�(0xff333333)
/// </summary>
- public uint TextColor1 = 0xff333333;
+ public uint TextColor1 = 0xff333333;
/// <summary>
/// 鈽嗙壒娈婃甯告枃鏈瓧浣撻鑹�2(0xff000000)
/// </summary>
- public uint TextColor2 = 0xff000000;
+ public uint TextColor2 = 0xff000000;
/// <summary>
/// 鈽嗙壒娈婃甯告枃鏈瓧浣撻鑹�3,杩欎釜鏄櫧鑹�(0xffffffff)
/// </summary>
- public uint TextColor3 = 0xffffffff;
+ public uint TextColor3 = 0xffffffff;
/// <summary>
/// 鈽嗙壒娈婃甯告枃鏈瓧浣撻鑹�4(0xff232323)
/// </summary>
- public uint TextColor4 = 0xff232323;
+ public uint TextColor4 = 0xff232323;
/// <summary>
/// 鈽嗚搴曠嚎鐨勯鑹�(0x66cccccc)
/// </summary>
- public uint ButtomLine = 0x66cccccc;
+ public uint ButtomLine = 0x66cccccc;
/// <summary>
/// 鈽嗚緭鍏ユ鎻愮ず淇℃伅鐨勫瓧浣撻鑹�(0xffcccccc)
/// </summary>
- public uint TextTipColor = 0xffcccccc;
- /// <summary>
- /// 鈽嗚繛鎺ュ姩鐢婚偅涓悆鐨勮儗鏅壊(0xfffc744b)
+ public uint TextTipColor = 0xffcccccc;
+ /// <summary>
+ /// 鈽嗚繛鎺ュ姩鐢婚偅涓悆鐨勮儗鏅壊(0xfffc744b)
/// </summary>
- public uint ConcetionRoundColor = 0xfffc744b;
- /// <summary>
- /// 鈽嗛粦鑹茶儗鏅�(0xff232323)
+ public uint ConcetionRoundColor = 0xfffc744b;
+ /// <summary>
+ /// 鈽嗛粦鑹茶儗鏅�(0xff232323)
/// </summary>
- public uint BlackBackGround = 0xff232323;
+ public uint BlackBackGround = 0xff232323;
/// <summary>
/// 鈽嗚緭鍏ユ杈规鐨勯鑹�(0xffcccccc)
/// </summary>
- public uint TextFrameColor = 0xffcccccc;
+ public uint TextFrameColor = 0xffcccccc;
/// <summary>
/// 鈽嗚緭鍏ユ杈规閫変腑鐨勯鑹�(0xfffc744b)
/// </summary>
public uint TextFrameSelectColor = 0xfffc744b;
- /// <summary>
- /// 鈽嗗ご閮ㄦ爣棰樼殑瀛椾綋棰滆壊(0xff030303)
+ /// <summary>
+ /// 鈽嗗ご閮ㄦ爣棰樼殑瀛椾綋棰滆壊(0xff030303)
/// </summary>
- public uint TopLayoutTitleText = 0xff030303;
+ public uint TopLayoutTitleText = 0xff030303;
/// <summary>
/// 鈽嗙伆鑹插瓧浣撻鑹�(0xff999999)
/// </summary>
- public uint TextGrayColor1 = 0xff999999;
+ public uint TextGrayColor1 = 0xff999999;
/// <summary>
/// 鈽嗙伆鑹插瓧浣撻鑹�2(0xffcccccc)
/// </summary>
- public uint TextGrayColor2 = 0xffcccccc;
+ public uint TextGrayColor2 = 0xffcccccc;
/// <summary>
/// 鈽嗙伆鑹插瓧浣撻鑹�3(0xff666666)
/// </summary>
- public uint TextGrayColor3 = 0xff666666;
+ public uint TextGrayColor3 = 0xff666666;
/// <summary>
/// 鈽嗗脊绐楀瀷鐢婚潰鐨勮儗鏅壊(0x80000000)
/// </summary>
public uint DialogBackColor = 0x80000000;
- /// <summary>
- /// 鈽嗘鑹茬殑鏂囨湰棰滆壊(0xfffc744b)
+ /// <summary>
+ /// 鈽嗘鑹茬殑鏂囨湰棰滆壊(0xfffc744b)
/// </summary>
- public uint TextOrangeColor = 0xfffc744b;
+ public uint TextOrangeColor = 0xfffc744b;
/// <summary>
/// 鈽嗚鎺т欢閫夋嫨鐘舵�佹椂鐨勮儗鏅壊(0xfffbfbfb)
/// </summary>
- public uint RowSelectBackColor = 0xfffbfbfb;
- /// <summary>
- /// 鈽嗛敊璇彁绀虹殑棰滆壊(0xfff75858)
- /// </summary>
- public uint ErrorColor = 0xfff75858;
- /// <summary>
- /// 鐏拌壊(0xff6b6b6b) 鍏朵粬鍦版柟浼间箮鍦ㄧ敤,寤鸿涓嶈浣跨敤
- /// </summary>
- public uint Gray = 0xff6b6b6b;
- /// <summary>
- /// 绾㈣壊(0xfff62f48) 鍏朵粬鍦版柟浼间箮鍦ㄧ敤,寤鸿涓嶈浣跨敤
- /// </summary>
- public uint Red = 0xfff62f48;
+ public uint RowSelectBackColor = 0xfffbfbfb;
+ /// <summary>
+ /// 鈽嗛敊璇彁绀虹殑棰滆壊(0xfff75858)
+ /// </summary>
+ public uint ErrorColor = 0xfff75858;
+ /// <summary>
+ /// 鍥剧墖閬僵鐨勯鑹�
+ /// </summary>
+ public uint PictrueZhezhaoColor = 0x12000000;
+ /// <summary>
+ /// 鐏拌壊(0xff6b6b6b) 鍏朵粬鍦版柟浼间箮鍦ㄧ敤,寤鸿涓嶈浣跨敤
+ /// </summary>
+ public uint Gray = 0xff6b6b6b;
+ /// <summary>
+ /// 绾㈣壊(0xfff62f48) 鍏朵粬鍦版柟浼间箮鍦ㄧ敤,寤鸿涓嶈浣跨敤
+ /// </summary>
+ public uint Red = 0xfff62f48;
}
}
--
Gitblit v1.8.0