Skip to content

Commit b8b4c79

Browse files
committed
epg detail
1 parent 1bf39ed commit b8b4c79

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

HISTORY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 更新日誌
22

3-
### v1.3.9.5
3+
### v1.3.9.6
44

55
* 遙控器左鍵/觸屏長按打開節目單
66

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -661,21 +661,21 @@ class MainActivity : AppCompatActivity() {
661661
}
662662

663663
private fun showProgram() {
664-
// if (menuFragment.isAdded && !menuFragment.isHidden) {
665-
// return
666-
// }
664+
if (menuFragment.isAdded && !menuFragment.isHidden) {
665+
return
666+
}
667667

668668
if (settingFragment.isAdded && !settingFragment.isHidden) {
669669
return
670670
}
671671

672-
val tvModel = viewModel.groupModel.getCurrent()
673-
Log.i(TAG, "tvModel ${tvModel?.tv}")
674-
// if (tvModel.epgValue.isEmpty()) {
675-
// R.string.epg_is_empty.showToast()
676-
// return
677-
// }
678-
//
672+
viewModel.groupModel.getCurrent()?.let {
673+
if (it.epgValue.isEmpty()) {
674+
R.string.epg_is_empty.showToast()
675+
return
676+
}
677+
}
678+
679679
showFragment(programFragment)
680680
}
681681

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version_code": 16976133, "version_name": "v1.3.9.5"}
1+
{"version_code": 16976134, "version_name": "v1.3.9.6"}

0 commit comments

Comments
 (0)