Merge branch 'wjc' into Dev-Branch

wxr

2023-03-01 8e65391ab8d48285f9049f2747fb420f3ad1b852

Merge branch 'wjc' into Dev-Branch

 HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png

 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" />

 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" />

 HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png

 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);
@@ -658,7 +660,11 @@
            }
            else
            {
                A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
                Application.RunOnMainThread(() =>
                {
                    loading.Hide();
                    A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
                });
            }
        }
        /// <summary>

 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>
        /// 音量图标