From bdc8f378f6d736fda030b3ceceab3acd91505679 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:10:50 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-cqy（1.5.9）
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
index e2d5c9d..f0eeb8a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
@@ -1,93 +1,94 @@
锘縰sing System;
namespace HDL_ON.UI.Music
{
- public static class TextSize
+ public class TextSize
{
- public static int TopLine = 1;
- public static int MiddleLine =1;
- public static int DownLine = 1;
+ public const int TopLine = 1;
+ public const int MiddleLine = 1;
+ public const int DownLine = 1;
- public static int Text24 = 24;
- public static int Text20 = 20;
- public static int Text18 = 18;
- public static int Text16 = 16;
- public static int Text14 = 14;
- public static int Text12 = 12;
- public static int Text10 = 10;
+ public const int Text24 = 24;
+ public const int Text20 = 20;
+ public const int Text18 = 18;
+ public const int Text16 = 16;
+ public const int Text14 = 14;
+ public const int Text12 = 12;
+ public const int Text10 = 10;
}
- public static class MusicColor
+ public class MusicColor
{
/// <summary>
/// 椤堕儴鑳屾櫙棰滆壊
/// </summary>
- public static uint TopViewColor = 0xFFF7F7F7;
+ public const uint TopViewColor = 0xFFF7F7F7;
/// <summary>
/// 鐣岄潰鑳屾櫙棰滆壊
/// </summary>
- public static uint ViewColor = 0xFFF2F3F7;
+ public const uint ViewColor = 0xFFF2F3F7;
/// <summary>
/// 鐧借壊鑳屾櫙棰滆壊
/// </summary>
- public static uint WhiteColor = 0xFFFFFFFF;
+ public const uint WhiteColor = 0xFFFFFFFF;
/// <summary>
/// 绾㈣壊鑳屾櫙棰滆壊
/// </summary>
- public static uint RedColor = 0xFFFF4747;
-
- /// <summary>
- /// 绾挎潯棰滆壊
- /// </summary>
- public static uint LineColor =0xFFECEDEE;
- /// <summary>
- /// 寮圭獥鑳屾櫙棰滆壊
- /// </summary>
- public static uint PopupBackgroundColor = 0x90000000;
+ public const uint RedColor = 0xFFFF4747;
/// <summary>
/// 绾挎潯棰滆壊
/// </summary>
- public static uint MusicEditColor = 0xFFFC9C04;
+ public const uint LineColor = 0xFFECEDEE;
/// <summary>
/// 寮圭獥鑳屾櫙棰滆壊
/// </summary>
- public static uint MusicDelColor = 0xFFFF7474;
+ public const uint PopupBackgroundColor = 0x90000000;
- public static uint Text18Color = 0xFF1B2D4D;
- public static uint MusicTxet14SelectedColor = 0xFF4484F4;
- public static uint MusicTxet14Color = 0xFF1B2D4D;
- public static uint MusicTxet12SelectedColor = 0xFF4484F4;
-
- public static uint MusicNoTxetColor = 0xFFC0C7D4;
- public static uint TextColor = 0xFF1B2D4D;
- public static uint SelectedColor = 0xFF4484F4;
+ /// <summary>
+ /// 绾挎潯棰滆壊
+ /// </summary>
+ public const uint MusicEditColor = 0xFFFC9C04;
+ /// <summary>
+ /// 寮圭獥鑳屾櫙棰滆壊
+ /// </summary>
+ public const uint MusicDelColor = 0xFFFF7474;
- public static uint TextTimeColor = 0xFF798394;
+ public const uint Text18Color = 0xFF1B2D4D;
+ public const uint MusicTxet14SelectedColor = 0xFF4484F4;
+ public const uint MusicTxet14Color = 0xFF1B2D4D;
+ public const uint MusicTxet12SelectedColor = 0xFF4484F4;
- public static uint TextCancelColor = 0xFF798394;
+ public const uint MusicNoTxetColor = 0xFFC0C7D4;
+ public const uint TextColor = 0xFF1B2D4D;
+ public const uint SelectedColor = 0xFF4484F4;
+
+ public const uint TextTimeColor = 0xFF798394;
+
+ public const uint TextCancelColor = 0xFF798394;
}
- public static class H_W {
+ public class H_W
+ {
/// <summary>
/// app楂樺害
/// </summary>
- public static int H = 667;
+ public const int H = 667;
/// <summary>
/// app瀹藉害
/// </summary>
- public static int W = 375;
+ public const int W = 375;
/// <summary>
/// 椤堕儴楂樺害
/// </summary>
- public static int T_Height = 64;
+ public const int T_Height = 64;
/// <summary>
/// 绾块珮搴�
/// </summary>
- public static int Line = 1;
+ public const int Line = 1;
}
--
Gitblit v1.8.0