From b55fe675d1dd17748a29e4e7de60d14e36740a6e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 14 十月 2023 13:01:30 +0800
Subject: [PATCH] 2023年10月14日13:01:27
---
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 29ad756..55b3559 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -387,7 +387,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.xuniyaokongqi,
+ Text= this.remoteControl.name,
+ IsBold = true,
};
this.AddChidren(btnTitle);
@@ -396,7 +397,7 @@
{
Y = btnTitle.Bottom + Application.GetRealHeight(16),
Width = Application.GetRealWidth(240),
- Height = Application.GetRealHeight(1095),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+ Height = Application.GetRealHeight(1095-122),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
Radius = (uint)Application.GetRealHeight(17),
BackgroundColor = 0xff798394,
Gravity = Gravity.CenterHorizontal,
@@ -409,7 +410,7 @@
Y = btnTitle.Bottom + Application.GetRealHeight(16),
//X = Application.GetRealWidth(71),
Width = Application.GetRealWidth(232),
- Height = Application.GetRealHeight(1095),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+ Height = Application.GetRealHeight(1095-122),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
Radius = (uint)Application.GetRealHeight(17),
BackgroundColor = 0xff19181E,
Gravity = Gravity.CenterHorizontal,
@@ -425,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);
@@ -444,7 +445,7 @@
switchBtn.IsSelected = false;
};
- int h = 49;
+ int h = 49-6;
int offset = 28;//x杞村亸绉婚噺
int septal = 36;//闂撮殧
#region
@@ -480,7 +481,7 @@
var line2Fl = new FrameLayout
{
- Y = line1Fl.Bottom + Application.GetRealHeight(16),
+ Y = line1Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line2Fl);
@@ -520,7 +521,7 @@
var line3Fl = new FrameLayout
{
- Y = line2Fl.Bottom + Application.GetRealHeight(16),
+ Y = line2Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line3Fl);
@@ -553,7 +554,7 @@
var line4Fl = new FrameLayout
{
- Y = line3Fl.Bottom + Application.GetRealHeight(16),
+ Y = line3Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line4Fl);
@@ -695,7 +696,7 @@
var line8Fl = new FrameLayout
{
- Y = line7Fl.Bottom + Application.GetRealHeight(32),
+ Y = line7Fl.Bottom + Application.GetRealHeight(16),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line8Fl);
@@ -740,14 +741,14 @@
var baseFl = new BaseFramLayout
{
Y = line8Fl.Bottom,
- Height = Application.GetRealHeight(207),
+ Height = Application.GetRealHeight(207-32-12),
};
layout.AddChidren(baseFl);
btnYingliangjia = new Button
{
- Y = Application.GetRealHeight(32),
+ Y = Application.GetRealHeight(16),
X = Application.GetRealWidth(26),
Width = Application.GetRealWidth(36),
Height = Application.GetRealWidth(36),
@@ -780,7 +781,7 @@
btnPindaojia = new Button
{
- Y = Application.GetRealHeight(32),
+ Y = Application.GetRealHeight(16),
X = Application.GetRealWidth(170),
Width = Application.GetRealWidth(36),
Height = Application.GetRealWidth(36),
@@ -813,7 +814,7 @@
okFl = new FrameLayout
{
- Y = Application.GetRealHeight(32),
+ Y = Application.GetRealHeight(16),
Height = Application.GetRealWidth(143),
Width = Application.GetRealWidth(143),
BackgroundImagePath = "AksIcon/ykq_ok.png",
@@ -938,7 +939,7 @@
var line10Fl = new FrameLayout
{
- Y = line9Fl.Bottom + Application.GetRealHeight(16),
+ Y = line9Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line10Fl);
@@ -982,7 +983,7 @@
var line11Fl = new FrameLayout
{
- Y = line10Fl.Bottom + Application.GetRealHeight(16),
+ Y = line10Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line11Fl);
@@ -993,7 +994,7 @@
kuaituiFL.AddImageView();
kuaituiFL.AddTextButtonView();
kuaituiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaitui.png";
- kuaituiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaitui_selected.png";
+ kuaituiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaijin_selected.png";
kuaituiFL.GetTextButton().Text = "蹇��";
kuaituiFL.AddClickView();
@@ -1019,7 +1020,7 @@
kusinjinFL.AddImageView();
kusinjinFL.AddTextButtonView();
kusinjinFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaijin.png";
- kusinjinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaijin_selected.png";
+ kusinjinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaitui_selected.png";
kusinjinFL.GetTextButton().Text = "蹇繘";
kusinjinFL.AddClickView();
@@ -1030,7 +1031,7 @@
var line12Fl = new FrameLayout
{
- Y = line11Fl.Bottom + Application.GetRealHeight(16),
+ Y = line11Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line12Fl);
@@ -1083,7 +1084,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.xuniyaokongqi;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
@@ -1122,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);
@@ -1144,6 +1145,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
+ Padding=new Padding(0,0,0,0),
};
Button btnNumber = new Button
{
@@ -1161,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