From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
index d219541..a53e62b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Drawing.Printing;
+using HDL_ON.Entity;
using HDL_ON.UI.Music;
using Shared;
@@ -93,6 +94,23 @@
fLayout.AddChidren(clickBackBtn);
fLayout.AddChidren(clickSetBtn);
+ return fLayout;
+ }
+
+ /// <summary>
+ /// 鏈�涓婇潰鐨勯偅鍧楁柟娉�
+ /// </summary>
+ /// <returns></returns>
+ public FrameLayout TopFLayoutView2()
+ {
+ fLayout.AddChidren(topNameBtn);
+ fLayout.AddChidren(backBtn);
+ lineBtn.Y = fLayout.Height - 1;
+ fLayout.AddChidren(lineBtn);
+ fLayout.AddChidren(setBtn);
+ fLayout.AddChidren(clickBackBtn);
+ fLayout.AddChidren(clickSetBtn);
+
var btnSetting = new Button()
{
@@ -106,7 +124,7 @@
btnSetting.MouseUpEventHandler = (sender, e) =>
{
- var infoView = new FunctionBaseInfoSetPage();
+ var infoView = new FunctionBaseInfoSetPage(new Entity.Function() { spk = SPK.LinphoneXiMo }, () => { });
MainPage.BasePageView.AddChidren(infoView);
infoView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0