From e4f7080639ee8cbc71172e5202f953924cedc074 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 12 十月 2023 16:37:40 +0800
Subject: [PATCH] 2023年10月12日16:37:10

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index ad0a05c..a0aa7e9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -136,16 +136,17 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
-                TextID = StringId.jidinghe,
+                Text= this.remoteControl.name,
+                IsBold = true,
             };
             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);
             cornerTopFram.SetMargin(16, 0, 16, 0);
-            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(),new List<int> { 5, 6 });
+            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(this.remoteControl),new List<int> { 5, 6 });
 
             #region  ----棰戦亾 鎺у埗----
             FrameLayout middLayout = new FrameLayout
@@ -175,6 +176,7 @@
                 SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
                 TextSize = TextSize.Text16,
                 TextID = StringId.pindao,
+                Padding = new Padding(0, 0, 0, 0),
             };
             leftLayout.AddChidren(leftBtnTitle);
 
@@ -217,6 +219,7 @@
                 SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
                 TextSize = TextSize.Text16,
                 TextID = StringId.kongzhi,
+                Padding = new Padding(0, 0, 0, 0),
             };
             rightLayout.AddChidren(rightBtnTitle);
 
@@ -250,12 +253,12 @@
             numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
             numberFrame.BackgroundColor = MusicColor.WhiteColor;
             numberFrame.SetMargin(16, 0, 16, 0);
-            numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList());
+            numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
             this.AddChidren(numberFrame);
 
 
             //鑿滃崟瀹瑰櫒
-            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;
@@ -268,7 +271,7 @@
             typeMultiFramLayout = new TypeMultiFramLayout();
             typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
             typeMultiFramLayout.AddView(cornerBottomFram);
-            typeMultiFramLayout.btnBottonRightName.TextID = StringId.jidinghe;
+            typeMultiFramLayout.btnBottonRightName.Text=this.remoteControl.name;
 
             //鍒濆鍊�
             leftBtnTitle.IsSelected = true;

--
Gitblit v1.8.0