add epg

HISTORY.md

@@ -1,5 +1,10 @@
 ## 更新日志
 
+### v1.7.6（通用）
+
+* 临时去掉部分频道，提高频道的可用性
+* 部分频道增加节目单
+
 ### v1.7.2（通用）
 
 * 支持节目列表网格样式和行样式切换，软件重启后生效

app/build.gradle

@@ -122,4 +122,6 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.13.3'
+
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
 }

app/src/main/java/com/lizongying/mytv/MainActivity.kt

@@ -57,7 +57,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
         setContentView(R.layout.activity_main)
 
-        Request.onCreate()
         Request.setRequestListener(this)
 
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -191,7 +190,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 6) {
+        if (ready == 5) {
             mainFragment.fragmentReady()
         }
     }

app/src/main/java/com/lizongying/mytv/MainFragment.kt

@@ -16,6 +16,7 @@ import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.databinding.RowBinding
 import com.lizongying.mytv.databinding.ShowBinding
+import com.lizongying.mytv.models.ProgramType
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
@@ -65,8 +66,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     tvViewModel.setItemPosition(idx2)
                     tvListViewModelCurrent.addTVViewModel(tvViewModel)
                     tvListViewModel.addTVViewModel(tvViewModel)
-
-                    updateEPG(tvViewModel)
                 }
                 tvListViewModel.maxNum.add(v.size)
 
@@ -263,6 +262,10 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     fun fragmentReady() {
 //            request.fetchPage()
         tvListViewModel.getTVViewModel(itemPosition)?.changed()
+
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+            updateEPG(tvViewModel)
+        }
     }
 
     fun play(itemPosition: Int) {
@@ -300,10 +303,18 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     private fun updateEPG(tvViewModel: TVViewModel) {
-        if (tvViewModel.getTV().channel == "港澳台") {
-            Request.fetchFEPG(tvViewModel)
-        } else {
-            Request.fetchYEPG(tvViewModel)
+        when (tvViewModel.getTV().programType) {
+            ProgramType.Y_PROTO -> {
+                Request.fetchYProtoEPG(tvViewModel)
+            }
+
+            ProgramType.Y_JCE -> {
+                Request.fetchYJceEPG(tvViewModel)
+            }
+
+            ProgramType.F -> {
+                Request.fetchFEPG(tvViewModel)
+            }
         }
     }