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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 5010dce..7086938 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -46,13 +46,13 @@
public uint XMInVisibleLine = 0x00000000;
public uint XMRowLine = 0x66CCCCCC;
/// <summary>
- /// 0xFF232323
- /// </summary>
- public uint XMSeekBarBackgroundColor = 0xFF232323;
- /// <summary>
/// 0xFFECECEC
/// </summary>
- public uint XMProgressBarColor = 0xFFECECEC;
+ public uint XMSeekBarBackgroundColor = 0xFFECECEC;
+ /// <summary>
+ /// 0xFF232323
+ /// </summary>
+ public uint XMProgressBarColor = 0xFF232323;
/// <summary>
/// 0xFFF5F6FA
/// </summary>
@@ -365,7 +365,9 @@
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