From 0c1b0cdf903114c4214f6b9298ecd440972a42b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 一月 2022 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into wxr0114

---
 HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
index 1dfd44f..9f1e81c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -10,14 +10,17 @@
         /// </summary>
         public FrameLayout muiscFl = new FrameLayout
         {
+            Name= "parentfl",
             Height = Application.GetRealHeight(12 + 139),
             Width = Application.GetRealWidth(375),
+            
         };
         /// <summary>
         ///鐧借壊鑳屾櫙鐨勬帶浠�
         /// </summary>
         public FrameLayout musicIfonFl = new FrameLayout
         {
+            Name = "musicparentfl",
             X = Application.GetRealWidth(16),
             Y = Application.GetRealHeight(12),
             Height = Application.GetRealHeight(139),
@@ -89,6 +92,7 @@
         /// </summary>
         public Button songNameBtn = new Button
         {
+            Name="song",
             X = Application.GetRealWidth(54),
             Y = Application.GetRealHeight(12),
             Width = Application.GetRealWidth(140),
@@ -102,6 +106,7 @@
         /// </summary>
         public Button singerBtn = new Button
         {
+            Name= "singer",
             X = Application.GetRealWidth(54),
             Y = Application.GetRealHeight(36),
             Width = Application.GetRealWidth(120),
@@ -116,6 +121,7 @@
         /// </summary>
         public Button musicNameBtn = new Button
         {
+            Name = "musicname",
             X = Application.GetRealWidth(54),
             Y = Application.GetRealHeight(40),//58
             Width = Application.GetRealWidth(140),
@@ -166,6 +172,7 @@
         /// </summary>
         public Button playBtn = new Button
         {
+            Tag= "playstatus",
             X = Application.GetRealWidth(233),
             Y = Application.GetRealHeight(101),
             Width = Application.GetRealWidth(32),
@@ -189,14 +196,14 @@
         /// 鎾斁鍣ㄧ晫闈㈢殑鏂规硶
         /// </summary>
         /// <param name="verticalRefresh"></param>
-        public void View(VerticalRefreshLayout verticalRefresh)
+        public void ViewAddChidren(VerticalRefreshLayout verticalRefresh) 
         {
             verticalRefresh.AddChidren(muiscFl);
             muiscFl.AddChidren(musicIfonFl);
             musicIfonFl.AddChidren(iconBtn);
-            musicIfonFl.AddChidren(mergeBjBtn);
-            musicIfonFl.AddChidren(mergeIconBtn);
-            musicIfonFl.AddChidren(mergeBtn);
+            //musicIfonFl.AddChidren(mergeBjBtn);
+            //musicIfonFl.AddChidren(mergeIconBtn);
+            //musicIfonFl.AddChidren(mergeBtn);
             musicIfonFl.AddChidren(collectIconBtn);
             musicIfonFl.AddChidren(songNameBtn);
             //musicIfonFl.AddChidren(singerBtn);

--
Gitblit v1.8.0