修复音乐播放列表异常

app/build.gradle

@@ -27,7 +27,7 @@ android {
         applicationId "com.jld.vod"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 195
+        versionCode 196
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/jld/vod/config/Config.kt

@@ -29,4 +29,5 @@ object Config {
     // 单个CPU线程池大小
     const val POOL_SIZE = 5
     var isShowAd = true
+    var isMusicAll:Boolean = true
 }

app/src/main/java/com/jld/vod/view/MusicPlayActivity.kt

@@ -336,26 +336,46 @@ class MusicPlayActivity : BaseActivity(),View.OnClickListener {
       //  }
      //   musicPlayViewModel.findMovieMidliveData.observe(this, observer)
 
-        OkHttpUtils.getInstance().getDataAsyn(Config.ApiBaseUrl+ "/music/findMusicByCid?cid=$cid&mid=$mid&lid=$lid",object :OkHttpUtils.MyNetCall{
-            override fun failed(call: Call?, e: IOException?) {
-               LogUtils.logE("e="+e)
-            }
-
-            override fun success(call: Call?, response: Response?) {
-                try {
-                    val json = response!!.body!!.string()
-                    val gson = Gson()
-                    val music = gson.fromJson(json, MusicByMidBeans::class.java)
-                    setTest(music.data)
-                }catch (e : Exception)
-                {
-                    e.printStackTrace()
+        if (Config.isMusicAll)//是否全部列表
+        {
+            OkHttpUtils.getInstance().getDataAsyn(Config.ApiBaseUrl+ "/music/findMusicByMid?mid=$mid&lid=$lid",object :OkHttpUtils.MyNetCall{
+                override fun failed(call: Call?, e: IOException?) {
+                    LogUtils.logE("e="+e)
                 }
 
-                //LogUtils.logD("response"+music.code)
-            }
-        })
+                override fun success(call: Call?, response: Response?) {
+                    try {
+                        val json = response!!.body!!.string()
+                        val gson = Gson()
+                        val music = gson.fromJson(json, MusicByMidBeans::class.java)
+                        setTest(music.data)
+                    }catch (e : Exception)
+                    {
+                        e.printStackTrace()
+                    }
+                    //LogUtils.logD("response"+music.code)
+                }
+            })
+        }else{
+            OkHttpUtils.getInstance().getDataAsyn(Config.ApiBaseUrl+ "/music/findMusicByCid?cid=$cid&mid=$mid&lid=$lid",object :OkHttpUtils.MyNetCall{
+                override fun failed(call: Call?, e: IOException?) {
+                    LogUtils.logE("e="+e)
+                }
+                override fun success(call: Call?, response: Response?) {
+                    try {
+                        val json = response!!.body!!.string()
+                        val gson = Gson()
+                        val music = gson.fromJson(json, MusicByMidBeans::class.java)
+                        setTest(music.data)
+                    }catch (e : Exception)
+                    {
+                        e.printStackTrace()
+                    }
 
+                    //LogUtils.logD("response"+music.code)
+                }
+            })
+        }
     }
 
     /**
@@ -460,7 +480,7 @@ class MusicPlayActivity : BaseActivity(),View.OnClickListener {
     private fun setTest(music:List<MusicByMidBean>) {
         var musicName:String? = ""
         for ((index,e) in music.withIndex()) {
-           // LogUtils.logD("清单:"+music[index])
+            //LogUtils.logD("清单:"+music[index])
              musicName = music[index].musicName
 
             val audio = Audio()
@@ -473,7 +493,7 @@ class MusicPlayActivity : BaseActivity(),View.OnClickListener {
             audioList.add(audio)
         }
 
-//        LogUtils.logD("播放:$audioList----$musicId")
+       // LogUtils.logD("播放:$audioList----$musicId")
 
         for ((index,e) in audioList.withIndex()){
             LogUtils.logD("播放:$musicName-----"+audioList[index].name)

app/src/main/java/com/jld/vod/view/fragment/MusicFragment.kt

@@ -11,6 +11,7 @@ import com.jld.kotilntest.room.adapter.CategoryFatherAllAdapter
 import com.jld.kotilntest.room.adapter.MusicListAdapter
 import com.jld.vod.R
 import com.jld.vod.base.BaseFragment
+import com.jld.vod.config.Config
 import com.jld.vod.utils.LogUtils
 import com.jld.vod.utils.SharedPrefUtils
 import com.jld.vod.view.MusicPlayActivity
@@ -27,7 +28,7 @@ class MusicFragment : BaseFragment() {
     private lateinit var mRecyclerView1: RecyclerView
     private lateinit var musicFragmentViewModel: MusicFragmentViewModel
     private lateinit var sfl_device_loading: StatefulLayout
-    private var isAll:Boolean = true
+
 
     override fun getLayoutId(): Int {
         return R.layout.fragment_music
@@ -41,6 +42,7 @@ class MusicFragment : BaseFragment() {
         musicFragmentViewModel = ViewModelProviders.of(this)
             .get(MusicFragmentViewModel::class.java)
 
+        Config.isMusicAll = true//默认全部列表
 
         //初始化一级分类列表recyclerview
         val LinearlayoutManager = LinearLayoutManager(activity)
@@ -97,7 +99,7 @@ class MusicFragment : BaseFragment() {
                         adapter.submitData(pagingData)
                     }
                 }
-                isAll = false
+                Config.isMusicAll = false
             }
         })