epg detail

lizongying · Mar 3, 2025 · b8b4c79 · b8b4c79
1 parent 1bf39ed
commit b8b4c79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,6 @@
 ## 更新日誌
 
-### v1.3.9.5
+### v1.3.9.6
 
 * 遙控器左鍵/觸屏長按打開節目單
 

diff --git a/app/src/main/java/com/lizongying/mytv0/MainActivity.kt b/app/src/main/java/com/lizongying/mytv0/MainActivity.kt
@@ -661,21 +661,21 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun showProgram() {
-//        if (menuFragment.isAdded && !menuFragment.isHidden) {
-//            return
-//        }
+        if (menuFragment.isAdded && !menuFragment.isHidden) {
+            return
+        }
 
         if (settingFragment.isAdded && !settingFragment.isHidden) {
             return
         }
 
-        val tvModel = viewModel.groupModel.getCurrent()
-        Log.i(TAG, "tvModel ${tvModel?.tv}")
-//        if (tvModel.epgValue.isEmpty()) {
-//            R.string.epg_is_empty.showToast()
-//            return
-//        }
-//
+        viewModel.groupModel.getCurrent()?.let {
+            if (it.epgValue.isEmpty()) {
+                R.string.epg_is_empty.showToast()
+                return
+            }
+        }
+
         showFragment(programFragment)
     }
 

diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"version_code": 16976133, "version_name": "v1.3.9.5"}
+{"version_code": 16976134, "version_name": "v1.3.9.6"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version_code": 16976133, "version_name": "v1.3.9.5"}
		{"version_code": 16976134, "version_name": "v1.3.9.6"}