From e209b6a3cebceb656d60d0724f55c6690ec39129 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 12 十月 2023 13:09:44 +0800
Subject: [PATCH] 2023年10月12日13:09:30
---
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 9 +++++----
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs | 10 ++++++----
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs | 3 ++-
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs | 8 ++++----
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 4 ++--
9 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index f80c659..e99872c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -10,7 +10,7 @@
{
public const int widthFrameLayout = 78;
- public const int heightFrameLayout = 84;
+ public const int heightFrameLayout = 84-6;
public const int lineW = 1;
public const int cornerValue = 8;
@@ -32,14 +32,14 @@
};
Button btnName = new Button
{
- Y = Application.GetRealHeight(12 + 32 + 8),
+ Y = Application.GetRealHeight(12 + 26 + 8),//(12 + 32 + 8)
Width = Application.GetRealWidth(widthFrameLayout),
Height = Application.GetRealHeight(20),
TextSize = TextSize.Text14,
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
- Padding = new Padding(0, 20, 0, 20),
+ Padding = new Padding(0, 10, 0, 10),
Name = "btnName",
@@ -175,7 +175,7 @@
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
- this.BackgroundColor = 0xFFEFEFEF;
+ this.BackgroundColor = 0xFFF2F3F7;
action?.Invoke(this, btnImage, btnName);
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 5279b01..e407837 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -258,8 +258,9 @@
IsBold = true,
Tag = keypad,
BackgroundColor = MusicColor.WhiteColor,
- SelectedBackgroundColor = 0xFFEFEFEF,
+ SelectedBackgroundColor = 0xFFF2F3F7,
Radius = (uint)Application.GetRealHeight(8),
+ SelectedTextColor = MusicColor.TextColor,
};
this.AddChidren(button);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
index d16b329..5f17c9e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
@@ -7,7 +7,7 @@
{
public const int widthFrameLayout = 80;
- public const int heightFrameLayout = 140;
+ public const int heightFrameLayout = 140-15;
public const int cornerValue = 12;
public VerticalBoutonFLayout(int width = widthFrameLayout, int height = heightFrameLayout)
@@ -22,7 +22,7 @@
{
Height = Application.GetRealWidth(40),
Width = Application.GetRealWidth(40),
- Radius = (uint)Application.GetRealHeight(20),
+ Radius = (uint)Application.GetRealWidth(20),
BackgroundColor = MusicColor.WhiteColor,
Gravity = Gravity.CenterHorizontal,
};
@@ -33,6 +33,7 @@
Gravity = Gravity.Center,
TextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text14,
+ IsBold=true,
};
public Button btnName = new Button
@@ -43,7 +44,7 @@
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
- Padding = new Padding(0, 20, 0, 20),
+ Padding = new Padding(0, 8, 0, 8),
IsMoreLines = true,
Text="none"
};
@@ -52,7 +53,7 @@
{
Height = Application.GetRealWidth(40),
Width = Application.GetRealWidth(40),
- Radius = (uint)Application.GetRealHeight(20),
+ Radius = (uint)Application.GetRealWidth(20),
BackgroundColor = MusicColor.WhiteColor,
Gravity = Gravity.CenterHorizontal,
};
@@ -63,6 +64,7 @@
Gravity = Gravity.Center,
TextColor = 0xFFA5AEBC,
TextSize = TextSize.Text14,
+ IsBold = true,
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index 30cf3a9..a77cf49 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -93,7 +93,7 @@
- cornerFram = new CornerFramLayout(343, 284, 17);
+ cornerFram = new CornerFramLayout(343, 284-18, 17);
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerFram);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index d19cc78..5903742 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -141,7 +141,7 @@
};
this.AddChidren(btnTitle);
- cornerTopFram = new CornerFramLayout(343, 368, 17);
+ cornerTopFram = new CornerFramLayout(343, 368-24, 17);
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
@@ -258,7 +258,7 @@
//鑿滃崟瀹瑰櫒
- CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17);
+ CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
cornerBottomFram.X = Application.GetRealWidth(16);
cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16);
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index 7f36165..7c4db8f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -129,7 +129,7 @@
};
this.AddChidren(btnTitle);
- cornerFram = new CornerFramLayout(343, 452, 17);
+ cornerFram = new CornerFramLayout(343, 452-30, 17);
this.AddChidren(cornerFram);
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 479e23d..dee191d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -145,7 +145,7 @@
};
this.AddChidren(btnTitle);
- cornerTopFram = new CornerFramLayout(343, 368, 17);
+ cornerTopFram = new CornerFramLayout(343, 368-24, 17);
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
@@ -262,7 +262,7 @@
//鑿滃崟瀹瑰櫒
- CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17);
+ CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
cornerBottomFram.X = Application.GetRealWidth(16);
cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16);
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 3b4fac9..2933d1c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -128,7 +128,7 @@
};
this.AddChidren(btnTitle);
- cornerTopFram = new CornerFramLayout(343, 452, 17);
+ cornerTopFram = new CornerFramLayout(343, 452-30, 17);
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
@@ -136,7 +136,7 @@
cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 3, 4, 5 });
- CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17);
+ CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
cornerBottomFram.X = Application.GetRealWidth(16);
cornerBottomFram.Y = cornerTopFram.Bottom + Application.GetRealHeight(16);
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 270b1e6..f8242be 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -426,7 +426,7 @@
Width = Application.GetRealWidth(48),
Gravity = Gravity.CenterHorizontal,
BackgroundColor = 0xff201F25,
- Radius = (uint)Application.GetRealHeight(24),
+ Radius = (uint)Application.GetRealWidth(24),
};
layout.AddChidren(switchFl);
@@ -1123,7 +1123,7 @@
class CustomFrameLayout : FrameLayout
{
public const int widthFrameLayout = 36;
- public const int heightFrameLayout = 49;
+ public const int heightFrameLayout = 49-6;
public CustomFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
{
this.Width = Application.GetRealWidth(width);
@@ -1145,6 +1145,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
+ Padding=new Padding(0,0,0,0),
};
Button btnNumber = new Button
{
@@ -1162,9 +1163,9 @@
Width = Application.GetRealWidth(12),
Height = Application.GetRealWidth(12),
Gravity = Gravity.Center,
- Radius = (uint)Application.GetRealHeight(6),
+ Radius = (uint)Application.GetRealWidth(6),
BackgroundColor=0x00000000,
- SelectedBackgroundColor = 0xFFEFEFEF,
+ SelectedBackgroundColor = 0xFFF2F3F7,
};
public FrameLayout clickFl = new FrameLayout
--
Gitblit v1.8.0