From 695e8d0de2ad758aa6c27fceabe31a388c60cfe4 Mon Sep 17 00:00:00 2001
From: Moriafly <62319450+Moriafly@users.noreply.github.com>
Date: Sun, 24 Jan 2021 09:54:55 +0800
Subject: [PATCH] v1.4.0-beta-290

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   3 +
 .../music/ui/activity/PlayerActivity.kt       |  59 ++-----
 .../music/ui/activity/PlaylistActivity2.kt    | 167 ++++++++++++++++++
 .../com/dirror/music/ui/base/BaseActivity.kt  |  27 +++
 .../{dialog => base}/BaseBottomSheetDialog.kt |   2 +-
 .../dirror/music/ui/dialog/AppInfoDialog.kt   |   1 +
 .../ui/dialog/CreateLocalPlaylistDialog.kt    |   1 +
 .../music/ui/dialog/PlayerMenuMoreDialog.kt   |   2 +-
 .../dirror/music/ui/dialog/PlaylistDialog.kt  |   1 +
 .../dirror/music/ui/dialog/SongMenuDialog.kt  |   1 +
 .../dirror/music/ui/fragment/MyFragment.kt    |  10 +-
 .../music/ui/viewmodel/MyFragmentViewModel.kt |  24 +--
 .../music/ui/viewmodel/PlaylistViewModel.kt   |  47 +++++
 14 files changed, 289 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/java/com/dirror/music/ui/activity/PlaylistActivity2.kt
 create mode 100644 app/src/main/java/com/dirror/music/ui/base/BaseActivity.kt
 rename app/src/main/java/com/dirror/music/ui/{dialog => base}/BaseBottomSheetDialog.kt (95%)
 create mode 100644 app/src/main/java/com/dirror/music/ui/viewmodel/PlaylistViewModel.kt

diff --git a/app/build.gradle b/app/build.gradle
index 91235416..45f6a33c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@ android {
         applicationId "com.dirror.music"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 289
+        versionCode 290
         versionName "2.4.0-beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc0f4c4b..29a171ce 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,6 +54,9 @@
         <activity
             android:name=".ui.activity.PlaylistActivity"
             android:theme="@style/AppTheme.FullScreen.Translucent" />
+        <activity
+            android:name=".ui.activity.PlaylistActivity2"
+            android:theme="@style/AppTheme.FullScreen.Translucent" />
         <activity android:name=".ui.activity.LoginByUidActivity" />
         <activity android:name=".ui.activity.LoginByPhoneActivity" />
         <activity
diff --git a/app/src/main/java/com/dirror/music/ui/activity/PlayerActivity.kt b/app/src/main/java/com/dirror/music/ui/activity/PlayerActivity.kt
index 430e21d9..f4148e73 100644
--- a/app/src/main/java/com/dirror/music/ui/activity/PlayerActivity.kt
+++ b/app/src/main/java/com/dirror/music/ui/activity/PlayerActivity.kt
@@ -8,7 +8,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.res.Configuration
 import android.graphics.Color
-import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
@@ -17,7 +16,6 @@ import android.view.View
 import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
 import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.palette.graphics.Palette
 import com.bumptech.glide.Glide
@@ -29,6 +27,7 @@ import com.dirror.music.databinding.ActivityPlayerBinding
 import com.dirror.music.music.standard.SongPicture
 import com.dirror.music.music.standard.data.SOURCE_NETEASE
 import com.dirror.music.service.MusicService
+import com.dirror.music.ui.base.BaseActivity
 import com.dirror.music.ui.dialog.PlayerMenuMoreDialog
 import com.dirror.music.ui.dialog.PlaylistDialog
 import com.dirror.music.ui.viewmodel.PlayerViewModel
@@ -44,7 +43,7 @@ import jp.wasabeef.glide.transformations.BlurTransformation
  * @author Moriafly
  * @since 2020年12月15日18:35:46
  */
-class PlayerActivity : AppCompatActivity() {
+class PlayerActivity : BaseActivity() {
 
     companion object {
         private const val MUSIC_BROADCAST_ACTION = "com.dirror.music.MUSIC_BROADCAST"
@@ -150,17 +149,19 @@ class PlayerActivity : AppCompatActivity() {
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun initBinding() {
         binding = ActivityPlayerBinding.inflate(layoutInflater)
         setContentView(binding.root)
+    }
+
+    override fun initView() {
         // 设置 SlideBackLayout
         slideBackLayout = SlideBackLayout(this, binding.clBase)
         slideBackLayout.bind()
         // 屏幕旋转
         val configuration = this.resources.configuration //获取设置的配置信息
         if (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            //横屏
+            // 横屏
             val decorView = window.decorView
             // TODO 解决方法过时问题
             val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
@@ -169,33 +170,6 @@ class PlayerActivity : AppCompatActivity() {
                     or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
             decorView.systemUiVisibility = uiOptions
         }
-        // 初始化广播接受者
-        initBroadcastReceiver()
-        // 初始化视图
-        initView()
-        // 初始化监听
-        initListener()
-        // 初始化 ViewModel 观察
-        initViewModelObserve()
-    }
-
-    /**
-     * 初始化广播接受者
-     */
-    private fun initBroadcastReceiver() {
-        // Intent 过滤器，只接收 "com.dirror.foyou.MUSIC_BROADCAST" 标识广播
-        val intentFilter = IntentFilter()
-        intentFilter.addAction(MUSIC_BROADCAST_ACTION)
-        musicBroadcastReceiver = MusicBroadcastReceiver()
-        // 注册接收器
-        registerReceiver(musicBroadcastReceiver, intentFilter)
-    }
-
-    /**
-     * 初始化视图
-     */
-    private fun initView() {
-
         // 页面状态栏适配
         (binding.titleBar.layoutParams as ConstraintLayout.LayoutParams).apply {
             topToTop = ConstraintLayout.LayoutParams.PARENT_ID
@@ -224,11 +198,8 @@ class PlayerActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * 初始化监听
-     */
     @SuppressLint("ClickableViewAccessibility")
-    private fun initListener() {
+    override fun initListener() {
         binding.apply {
             // 返回按钮
             ivBack.setOnClickListener { finish() }
@@ -349,10 +320,16 @@ class PlayerActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * 初始化观察者
-     */
-    private fun initViewModelObserve() {
+    override fun initBroadcastReceiver() {
+        // Intent 过滤器，只接收 "com.dirror.foyou.MUSIC_BROADCAST" 标识广播
+        val intentFilter = IntentFilter()
+        intentFilter.addAction(MUSIC_BROADCAST_ACTION)
+        musicBroadcastReceiver = MusicBroadcastReceiver()
+        // 注册接收器
+        registerReceiver(musicBroadcastReceiver, intentFilter)
+    }
+
+    override fun initObserver() {
         playViewModel.apply {
             // 播放模式的观察
             playMode.observe(this@PlayerActivity, {
diff --git a/app/src/main/java/com/dirror/music/ui/activity/PlaylistActivity2.kt b/app/src/main/java/com/dirror/music/ui/activity/PlaylistActivity2.kt
new file mode 100644
index 00000000..936f73f0
--- /dev/null
+++ b/app/src/main/java/com/dirror/music/ui/activity/PlaylistActivity2.kt
@@ -0,0 +1,167 @@
+package com.dirror.music.ui.activity
+
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.view.View
+import androidx.activity.viewModels
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.dirror.music.MyApplication
+import com.dirror.music.R
+import com.dirror.music.adapter.DetailPlaylistAdapter
+import com.dirror.music.data.PLAYLIST_TAG_NORMAL
+import com.dirror.music.databinding.ActivityPlaylistBinding
+import com.dirror.music.music.standard.SongPicture
+import com.dirror.music.music.standard.data.SOURCE_NETEASE
+import com.dirror.music.ui.base.BaseActivity
+import com.dirror.music.ui.dialog.PlaylistDialog
+import com.dirror.music.ui.viewmodel.PlaylistViewModel
+import com.dirror.music.util.*
+
+/**
+ * 新版 Playlist
+ */
+class PlaylistActivity2: BaseActivity() {
+
+    companion object {
+        const val EXTRA_PLAYLIST_SOURCE = "int_playlist_source"
+        const val EXTRA_LONG_PLAYLIST_ID = "int_playlist_id"
+        const val EXTRA_INT_TAG = "int_tag"
+    }
+
+    private lateinit var binding: ActivityPlaylistBinding
+
+    // 音乐广播接收
+    private lateinit var musicBroadcastReceiver: MusicBroadcastReceiver
+
+    private var detailPlaylistAdapter = DetailPlaylistAdapter(ArrayList(), this)
+
+    private val playlistViewModel: PlaylistViewModel by viewModels()
+
+    override fun initBinding() {
+        binding = ActivityPlaylistBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+    }
+
+    override fun initView() {
+        // 屏幕适配
+        (binding.titleBar.layoutParams as ConstraintLayout.LayoutParams).apply {
+            topMargin = getStatusBarHeight(window, this@PlaylistActivity2)
+        }
+        (binding.includePlay.root.layoutParams as ConstraintLayout.LayoutParams).apply {
+            bottomMargin = getNavigationBarHeight(this@PlaylistActivity2)
+        }
+        // 色彩
+        binding.ivPlayAll.setColorFilter(getColor(R.color.colorAppThemeColor))
+
+        // 获取歌单来源
+        playlistViewModel.source = intent.getIntExtra(EXTRA_PLAYLIST_SOURCE, SOURCE_NETEASE)
+        // 获取歌单 id
+        playlistViewModel.id = intent.getLongExtra(EXTRA_LONG_PLAYLIST_ID, 0L)
+        // 获取 tag
+        playlistViewModel.tag = intent.getIntExtra(EXTRA_INT_TAG, PLAYLIST_TAG_NORMAL)
+
+        binding.lottieLoading.repeatCount = -1
+        binding.lottieLoading.playAnimation()
+
+        // 请求更新
+        playlistViewModel.updatePlaylist()
+
+        binding.rvPlaylist.layoutManager =  LinearLayoutManager(this@PlaylistActivity2)
+    }
+
+    override fun initBroadcastReceiver() {
+        val intentFilter = IntentFilter() // Intent 过滤器
+        intentFilter.addAction("com.dirror.music.MUSIC_BROADCAST") // 只接收 "com.dirror.foyou.MUSIC_BROADCAST" 标识广播
+        musicBroadcastReceiver = MusicBroadcastReceiver() //
+        registerReceiver(musicBroadcastReceiver, intentFilter) // 注册接收器
+    }
+
+    override fun initListener() {
+        binding.apply {
+            includePlay.root.setOnClickListener {
+                startActivity(Intent(this@PlaylistActivity2, PlayerActivity::class.java))
+                overridePendingTransition(
+                    R.anim.anim_slide_enter_bottom,
+                    R.anim.anim_no_anim
+                )
+            }
+            includePlay.ivPlay.setOnClickListener {
+                MyApplication.musicBinderInterface?.changePlayState()
+            }
+            includePlay.ivPlaylist.setOnClickListener {
+                PlaylistDialog(this@PlaylistActivity2).show()
+            }
+            // 全部播放 播放第一首歌
+            clNav.setOnClickListener {
+                if (detailPlaylistAdapter.itemCount != 0) {
+                    detailPlaylistAdapter.playFirst()
+                }
+            }
+            ivShare.setOnClickListener {
+                toast("歌单 ID 已经成功复制到剪贴板")
+                copyToClipboard(this@PlaylistActivity2, playlistViewModel.id.toString())
+            }
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun initObserver() {
+        playlistViewModel.apply {
+            playlist.observe(this@PlaylistActivity2, {
+                detailPlaylistAdapter = DetailPlaylistAdapter(it, this@PlaylistActivity2, tag)
+                binding.rvPlaylist.adapter = detailPlaylistAdapter
+                binding.tvPlayAll.text = "播放全部(${it.size})"
+                binding.clLoading.visibility = View.GONE
+                binding.lottieLoading.pauseAnimation()
+            })
+        }
+    }
+
+    inner class MusicBroadcastReceiver: BroadcastReceiver() {
+        // 接收
+        override fun onReceive(context: Context, intent: Intent) {
+            refreshLayoutPlay()
+            refreshPlayState()
+        }
+    }
+
+    private fun refreshPlayState() {
+        if (MyApplication.musicBinderInterface?.getPlayState() == true) {
+            binding.includePlay.ivPlay.setImageResource(R.drawable.ic_bq_control_pause)
+        } else {
+            binding.includePlay.ivPlay.setImageResource(R.drawable.ic_bq_control_play)
+        }
+    }
+
+    /**
+     * 刷新下方播放框
+     * 可能导致 stick 丢失
+     */
+    private fun refreshLayoutPlay() {
+        MyApplication.musicBinderInterface?.getNowSongData()?.let { standardSongData ->
+            binding.includePlay.tvName.text = standardSongData.name
+            binding.includePlay.tvArtist.text = standardSongData.artists?.let { parseArtist(it) }
+            SongPicture.getSongPicture(standardSongData, SongPicture.TYPE_LARGE) {
+                binding.includePlay.ivCover.setImageBitmap(it)
+            }
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        refreshLayoutPlay()
+        refreshPlayState()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // 解绑
+        unregisterReceiver(musicBroadcastReceiver)
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/music/ui/base/BaseActivity.kt b/app/src/main/java/com/dirror/music/ui/base/BaseActivity.kt
new file mode 100644
index 00000000..ec87249d
--- /dev/null
+++ b/app/src/main/java/com/dirror/music/ui/base/BaseActivity.kt
@@ -0,0 +1,27 @@
+package com.dirror.music.ui.base
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+abstract class BaseActivity: AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initBinding()
+        initView()
+        initListener()
+        initObserver()
+        initBroadcastReceiver()
+    }
+
+    protected open fun initBinding() { }
+
+    protected open fun initView() { }
+
+    protected open fun initListener() { }
+
+    protected open fun initObserver() { }
+
+    protected open fun initBroadcastReceiver() { }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/music/ui/dialog/BaseBottomSheetDialog.kt b/app/src/main/java/com/dirror/music/ui/base/BaseBottomSheetDialog.kt
similarity index 95%
rename from app/src/main/java/com/dirror/music/ui/dialog/BaseBottomSheetDialog.kt
rename to app/src/main/java/com/dirror/music/ui/base/BaseBottomSheetDialog.kt
index 9dd8aa27..70966fa4 100644
--- a/app/src/main/java/com/dirror/music/ui/dialog/BaseBottomSheetDialog.kt
+++ b/app/src/main/java/com/dirror/music/ui/base/BaseBottomSheetDialog.kt
@@ -1,4 +1,4 @@
-package com.dirror.music.ui.dialog
+package com.dirror.music.ui.base
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/com/dirror/music/ui/dialog/AppInfoDialog.kt b/app/src/main/java/com/dirror/music/ui/dialog/AppInfoDialog.kt
index 1ef21b96..c6a10722 100644
--- a/app/src/main/java/com/dirror/music/ui/dialog/AppInfoDialog.kt
+++ b/app/src/main/java/com/dirror/music/ui/dialog/AppInfoDialog.kt
@@ -7,6 +7,7 @@ import com.dirror.music.MyApplication
 import com.dirror.music.databinding.DialogTextInfoBinding
 import com.dirror.music.foyou.sentence.foyoulibrary.FoyouLibrary
 import com.dirror.music.room.AppDatabase
+import com.dirror.music.ui.base.BaseBottomSheetDialog
 import com.dirror.music.util.Secure
 import com.dirror.music.util.defaultTypeface
 import com.dirror.music.util.getVisionCode
diff --git a/app/src/main/java/com/dirror/music/ui/dialog/CreateLocalPlaylistDialog.kt b/app/src/main/java/com/dirror/music/ui/dialog/CreateLocalPlaylistDialog.kt
index 829961e8..726931cf 100644
--- a/app/src/main/java/com/dirror/music/ui/dialog/CreateLocalPlaylistDialog.kt
+++ b/app/src/main/java/com/dirror/music/ui/dialog/CreateLocalPlaylistDialog.kt
@@ -3,6 +3,7 @@ package com.dirror.music.ui.dialog
 import android.content.Context
 import com.dirror.music.databinding.DialogCreateLocalPlaylistBinding
 import com.dirror.music.music.local.LocalPlaylist
+import com.dirror.music.ui.base.BaseBottomSheetDialog
 import com.dirror.music.util.toast
 
 /**
diff --git a/app/src/main/java/com/dirror/music/ui/dialog/PlayerMenuMoreDialog.kt b/app/src/main/java/com/dirror/music/ui/dialog/PlayerMenuMoreDialog.kt
index e6d183dc..5c553b2a 100644
--- a/app/src/main/java/com/dirror/music/ui/dialog/PlayerMenuMoreDialog.kt
+++ b/app/src/main/java/com/dirror/music/ui/dialog/PlayerMenuMoreDialog.kt
@@ -8,7 +8,7 @@ import com.dirror.music.music.local.MyFavorite
 import com.dirror.music.music.standard.data.StandardSongData
 import com.dirror.music.ui.activity.FeedbackActivity
 import com.dirror.music.ui.activity.PlayHistoryActivity
-import com.dirror.music.util.toast
+import com.dirror.music.ui.base.BaseBottomSheetDialog
 
 class PlayerMenuMoreDialog(context: Context) : BaseBottomSheetDialog(context) {
 
diff --git a/app/src/main/java/com/dirror/music/ui/dialog/PlaylistDialog.kt b/app/src/main/java/com/dirror/music/ui/dialog/PlaylistDialog.kt
index 8f7d3ce7..c7d3f399 100644
--- a/app/src/main/java/com/dirror/music/ui/dialog/PlaylistDialog.kt
+++ b/app/src/main/java/com/dirror/music/ui/dialog/PlaylistDialog.kt
@@ -6,6 +6,7 @@ import com.dirror.music.MyApplication
 import com.dirror.music.R
 import com.dirror.music.adapter.PlaylistDialogAdapter
 import com.dirror.music.databinding.DialogPlayListBinding
+import com.dirror.music.ui.base.BaseBottomSheetDialog
 
 class PlaylistDialog(context: Context): BaseBottomSheetDialog(context) {
 
diff --git a/app/src/main/java/com/dirror/music/ui/dialog/SongMenuDialog.kt b/app/src/main/java/com/dirror/music/ui/dialog/SongMenuDialog.kt
index 4b01669f..bfc51d08 100644
--- a/app/src/main/java/com/dirror/music/ui/dialog/SongMenuDialog.kt
+++ b/app/src/main/java/com/dirror/music/ui/dialog/SongMenuDialog.kt
@@ -8,6 +8,7 @@ import com.dirror.music.data.PLAYLIST_TAG_NORMAL
 import com.dirror.music.databinding.DialogSongMenuBinding
 import com.dirror.music.music.local.MyFavorite
 import com.dirror.music.music.standard.data.StandardSongData
+import com.dirror.music.ui.base.BaseBottomSheetDialog
 import com.dirror.music.util.toast
 
 class SongMenuDialog
diff --git a/app/src/main/java/com/dirror/music/ui/fragment/MyFragment.kt b/app/src/main/java/com/dirror/music/ui/fragment/MyFragment.kt
index 7ce840d3..c1f7d193 100644
--- a/app/src/main/java/com/dirror/music/ui/fragment/MyFragment.kt
+++ b/app/src/main/java/com/dirror/music/ui/fragment/MyFragment.kt
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.dirror.music.MyApplication
 import com.dirror.music.adapter.PlaylistAdapter
+import com.dirror.music.data.PLAYLIST_TAG_MY_FAVORITE
 import com.dirror.music.data.PlaylistData
 import com.dirror.music.databinding.FragmentMyBinding
 import com.dirror.music.music.standard.data.SOURCE_LOCAL
@@ -20,6 +21,7 @@ import com.dirror.music.music.standard.data.StandardLocalPlaylistData
 import com.dirror.music.ui.activity.LocalMusicActivity
 import com.dirror.music.ui.activity.PlayHistoryActivity
 import com.dirror.music.ui.activity.PlaylistActivity
+import com.dirror.music.ui.activity.PlaylistActivity2
 import com.dirror.music.ui.viewmodel.MainViewModel
 import com.dirror.music.ui.viewmodel.MyFragmentViewModel
 import com.dirror.music.util.*
@@ -57,9 +59,11 @@ class MyFragment : Fragment() {
         binding.apply {
             // 我喜欢的音乐
             clMyFavorite.setOnClickListener {
-                val intent = Intent(this@MyFragment.context, PlaylistActivity::class.java)
-                intent.putExtra(PlaylistActivity.EXTRA_PLAYLIST_SOURCE, SOURCE_LOCAL)
-                intent.putExtra(PlaylistActivity.EXTRA_LONG_PLAYLIST_ID, 0L)
+                val intent = Intent(this@MyFragment.context, PlaylistActivity2::class.java).apply {
+                    putExtra(PlaylistActivity2.EXTRA_PLAYLIST_SOURCE, SOURCE_LOCAL)
+                    putExtra(PlaylistActivity2.EXTRA_LONG_PLAYLIST_ID, 0L)
+                    putExtra(PlaylistActivity2.EXTRA_INT_TAG, PLAYLIST_TAG_MY_FAVORITE)
+                }
                 startActivity(intent)
             }
             // 新建歌单
diff --git a/app/src/main/java/com/dirror/music/ui/viewmodel/MyFragmentViewModel.kt b/app/src/main/java/com/dirror/music/ui/viewmodel/MyFragmentViewModel.kt
index ebdb62ad..b537df9e 100644
--- a/app/src/main/java/com/dirror/music/ui/viewmodel/MyFragmentViewModel.kt
+++ b/app/src/main/java/com/dirror/music/ui/viewmodel/MyFragmentViewModel.kt
@@ -37,17 +37,19 @@ class MyFragmentViewModel : ViewModel() {
         val url = "${CloudMusicApi.USER_PLAYLIST}?limit=30&offset=${offset * 30}&uid=${uid}"
         loge(url, "myFragment")
         MagicHttp.OkHttpManager().newGet(url, {
-            val userPlaylistData = Gson().fromJson(it, UserPlaylistData::class.java)
-            for (playlist in userPlaylistData.playlist) {
-                _userPlaylistList.add(playlist)
-            }
-            if (userPlaylistData.more && offset < 3) {
-                offset++
-                updatePlaylist()
-            } else {
-                offset = 0
-                runOnMainThread {
-                    userPlaylistList.value = _userPlaylistList
+            runOnMainThread {
+                val userPlaylistData = Gson().fromJson(it, UserPlaylistData::class.java)
+                for (playlist in userPlaylistData.playlist) {
+                    _userPlaylistList.add(playlist)
+                }
+                if (userPlaylistData.more && offset < 3) {
+                    offset++
+                    updatePlaylist()
+                } else {
+                    offset = 0
+                    runOnMainThread {
+                        userPlaylistList.value = _userPlaylistList
+                    }
                 }
             }
         }, { })
diff --git a/app/src/main/java/com/dirror/music/ui/viewmodel/PlaylistViewModel.kt b/app/src/main/java/com/dirror/music/ui/viewmodel/PlaylistViewModel.kt
new file mode 100644
index 00000000..ded7d9c8
--- /dev/null
+++ b/app/src/main/java/com/dirror/music/ui/viewmodel/PlaylistViewModel.kt
@@ -0,0 +1,47 @@
+package com.dirror.music.ui.viewmodel
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.dirror.music.data.PLAYLIST_TAG_NORMAL
+import com.dirror.music.music.local.MyFavorite
+import com.dirror.music.music.standard.data.SOURCE_LOCAL
+import com.dirror.music.music.standard.data.SOURCE_NETEASE
+import com.dirror.music.music.standard.data.StandardSongData
+import com.dirror.music.util.runOnMainThread
+
+class PlaylistViewModel: ViewModel() {
+
+    // id
+    var id = 0L
+
+    // source
+    var source = SOURCE_NETEASE
+
+    // tag
+    var tag = PLAYLIST_TAG_NORMAL
+
+    // 歌单
+    var playlist = MutableLiveData<ArrayList<StandardSongData>>()
+
+    /**
+     * 更新歌单
+     */
+    fun updatePlaylist() {
+
+        // 数据库
+        when (source) {
+            SOURCE_LOCAL -> {
+                // 我喜欢的歌曲
+                if (id == 0L) {
+                    MyFavorite.read {
+                        runOnMainThread {
+                            playlist.value = it
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+}
\ No newline at end of file