some channel epg

lizongying · Apr 3, 2024 · 74b6287 · 74b6287
1 parent a3a9bdc
commit 74b6287
Show file tree

Hide file tree

Showing 45 changed files with 4,132 additions and 304 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,11 +1,18 @@
 ## 更新日志
 
+### v1.7.6（通用）
+
+* 临时去掉部分频道，提高频道的可用性
+* 部分频道增加节目单
+
 ### v1.7.4（通用）
 
 * 修复368
 
 ### v1.7.3（安卓5及以上专用）
 
+* 临时去掉部分频道，提高频道的可用性
+* 部分频道增加节目单
 * 遥控器左键进入节目列表
 * 遥控器右键进入菜单
 

diff --git a/README.md b/README.md
@@ -31,13 +31,13 @@ adb install my-tv.apk
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
-* 自定义源
 * 海外
 * 节目增加预告
 * 频道列表优化
 * 自动更新
 * 显示时间
 * 软解
+* 不同分辨率
 
 ## 赞赏
 

diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt
@@ -58,7 +58,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
         setContentView(R.layout.activity_main)
 
-        Request.onCreate()
         Request.setRequestListener(this)
 
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
@@ -202,7 +201,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 6) {
+        if (ready == 5) {
             mainFragment.fragmentReady()
         }
     }

diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt
@@ -19,6 +19,7 @@ import androidx.leanback.widget.Row
 import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.api.YSP
+import com.lizongying.mytv.models.ProgramType
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
@@ -298,10 +299,18 @@ class MainFragment : BrowseSupportFragment() {
     }
 
     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)
+            }
         }
     }