From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2
---
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index b0b8974..a77cf49 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+锘� using System;
using System.Collections.Generic;
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
@@ -86,13 +86,14 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.gongfan,
+ Text= this.remoteControl.name,
+ IsBold = true,
};
this.AddChidren(btnTitle);
- 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);
@@ -110,7 +111,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.gongfan;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
--
Gitblit v1.8.0