From 347545d8605ba0b992799d558db5a592dadf82f2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 21 二月 2023 16:26:35 +0800
Subject: [PATCH] 2023年02月21日16:26:24
---
HDL-ON_Android/HDL-ON_Android.csproj | 1 +
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 10 ++++++----
HDL-ON_iOS/HDL-ON_iOS.csproj | 1 +
HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png | 0
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs | 2 +-
HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png | 0
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png b/HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png
new file mode 100644
index 0000000..1cb04da
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index bfd4a20..7dab4a9 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -419,6 +419,7 @@
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
<AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <AndroidAsset Include="Assets\Phone\MusicIcon\currentPlayList.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index db8fc14..d6e2020 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1562,6 +1562,7 @@
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png b/HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png
new file mode 100644
index 0000000..1cb04da
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 3e6893d..168d4b0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -182,9 +182,12 @@
UI2.FuntionControlView.Music.View.MyListView myListView = new UI2.FuntionControlView.Music.View.MyListView();
myListView.frameLayout(this, A31MusicModel.Current);
myListView.dialogFra.AddChidren(loading);//dialogFra鍒锋柊鍥炬爣鐖舵帶浠�
+ loading.Start();
///涓嬫媺鍒锋柊
myListView.verticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
+ myListView.verticalScrolViewLayout.EndHeaderRefreshing(); //缁撴潫鍒锋柊
+ loading.Start();
System.Threading.Tasks.Task.Run((() =>
{
try
@@ -197,7 +200,6 @@
Application.RunOnMainThread(() =>
{
- //myListView.verticalScrolViewLayout.EndHeaderRefreshing();
myListView.verticalScrolViewLayout.RemoveAll();
var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
@@ -215,7 +217,8 @@
{
Application.RunOnMainThread(() =>
{
- myListView.verticalScrolViewLayout.EndHeaderRefreshing();
+ loading.Hide();
+ //myListView.verticalScrolViewLayout.EndHeaderRefreshing();
//myListView.verticalScrolViewLayout.RemoveAll();
//var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
//var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
@@ -225,7 +228,6 @@
});
}
}));
- //缁撴潫鍒锋柊
};
///绉婚櫎鐣岄潰
@@ -234,7 +236,7 @@
myListView.popFra.RemoveFromParent();
};
myListView.backIextBtn.MouseUpEventHandler += removeFromParentView;
- myListView.popFra.MouseUpEventHandler += removeFromParentView;
+ //myListView.popFra.MouseUpEventHandler += removeFromParentView;
#endregion
//var listName = A31MusicModel.Current.functionMusic.GetAttribute("playlist_name").ToString();
//var musicList = A31MusicModel.Current.GetSongList(listName);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 5335d37..c045e40 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -184,7 +184,7 @@
Y = Application.GetRealHeight(355),
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
- UnSelectedImagePath = "MusicIcon/playList.png",
+ UnSelectedImagePath = "MusicIcon/currentPlayList.png",
};
/// <summary>
/// 闊抽噺鍥炬爣
--
Gitblit v1.8.0