From 286cec465a79437c778e13e892b36970ae1c0183 Mon Sep 17 00:00:00 2001 From: Li ZongYing Date: Fri, 29 Dec 2023 10:44:58 +0800 Subject: [PATCH] some info style --- .../java/com/lizongying/mytv/InfoFragment.kt | 6 +-- .../java/com/lizongying/mytv/MainActivity.kt | 41 +++++++++---------- .../com/lizongying/mytv/PlayerFragment.kt | 12 +++--- .../main/java/com/lizongying/mytv/Utils.kt | 4 +- .../main/java/com/lizongying/mytv/api/YSP.kt | 5 +-- .../com/lizongying/mytv/models/TVViewModel.kt | 11 ++--- app/src/main/res/layout/info.xml | 4 +- 7 files changed, 37 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt index a5279f2..5c3fc5e 100644 --- a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt @@ -34,7 +34,7 @@ class InfoFragment : Fragment() { } fun show(tvViewModel: TVViewModel) { - Log.i("", "show") + Log.i(TAG, "show") binding.textView.text = tvViewModel.title.value Glide.with(this) .load(tvViewModel.logo.value) @@ -51,13 +51,13 @@ class InfoFragment : Fragment() { override fun onPause() { super.onPause() - Log.i("", "onPause") + Log.i(TAG, "onPause") // Cancel the delayed task when the fragment is paused handler.removeCallbacks(removeRunnable) } private val removeRunnable = Runnable { - Log.i("", "hide") + Log.i(TAG, "hide") view?.visibility = View.GONE } diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt index 0fab0b0..8a6e290 100644 --- a/app/src/main/java/com/lizongying/mytv/MainActivity.kt +++ b/app/src/main/java/com/lizongying/mytv/MainActivity.kt @@ -214,9 +214,6 @@ class MainActivity : FragmentActivity() { KeyEvent.KEYCODE_DPAD_CENTER -> { Log.i(TAG, "KEYCODE_DPAD_CENTER") -// if (mainFragment.isHidden) { -// mainFragment.checkProgram() -// } switchMainFragment() } @@ -246,28 +243,28 @@ class MainActivity : FragmentActivity() { } KeyEvent.KEYCODE_DPAD_LEFT -> { - if (mainFragment.isHidden) { - prevSource() - } else { -// if (mainFragment.tvListViewModel.getTVViewModelCurrent() -// ?.getItemPosition() == 0 -// ) { -//// mainFragment.toLastPosition() -// hideMainFragment() -// } - } +// if (mainFragment.isHidden) { +// prevSource() +// } else { +//// if (mainFragment.tvListViewModel.getTVViewModelCurrent() +//// ?.getItemPosition() == 0 +//// ) { +////// mainFragment.toLastPosition() +//// hideMainFragment() +//// } +// } } KeyEvent.KEYCODE_DPAD_RIGHT -> { - if (mainFragment.isHidden) { - nextSource() - } else { -// if (mainFragment.tvListViewModel.getTVViewModelCurrent() -// ?.getItemPosition() == mainFragment.tvListViewModel.maxNum[mainFragment.selectedPosition] - 1 -// ) { -// mainFragment.toFirstPosition() -// } - } +// if (mainFragment.isHidden) { +// nextSource() +// } else { +//// if (mainFragment.tvListViewModel.getTVViewModelCurrent() +//// ?.getItemPosition() == mainFragment.tvListViewModel.maxNum[mainFragment.selectedPosition] - 1 +//// ) { +//// mainFragment.toFirstPosition() +//// } +// } } } diff --git a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt index 7c5ae0c..23e58a8 100644 --- a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt @@ -88,17 +88,17 @@ class PlayerFragment : Fragment() { } } - override fun onPause() { - super.onPause() + override fun onStart() { + super.onStart() if (playerView != null) { - playerView!!.player?.stop() + playerView!!.player?.play() } } - override fun onResume() { - super.onResume() + override fun onStop() { + super.onStop() if (playerView != null) { - playerView!!.player?.play() + playerView!!.player?.stop() } } diff --git a/app/src/main/java/com/lizongying/mytv/Utils.kt b/app/src/main/java/com/lizongying/mytv/Utils.kt index 1282925..241e536 100644 --- a/app/src/main/java/com/lizongying/mytv/Utils.kt +++ b/app/src/main/java/com/lizongying/mytv/Utils.kt @@ -9,7 +9,7 @@ object Utils { return SimpleDateFormat(format, Locale.CHINA).format(Date()) } - fun getDateTimestamp(): Int { - return (Date().time / 1000).toInt() + fun getDateTimestamp(): Long { + return Date().time / 1000 } } \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/api/YSP.kt b/app/src/main/java/com/lizongying/mytv/api/YSP.kt index 600d89e..267b033 100644 --- a/app/src/main/java/com/lizongying/mytv/api/YSP.kt +++ b/app/src/main/java/com/lizongying/mytv/api/YSP.kt @@ -2,11 +2,10 @@ package com.lizongying.mytv.api import android.content.Context import android.content.SharedPreferences -import android.util.Log import com.lizongying.mytv.Encryptor import com.lizongying.mytv.MainActivity +import com.lizongying.mytv.Utils.getDateTimestamp import com.lizongying.mytv.models.TVViewModel -import java.util.Date import kotlin.math.floor import kotlin.random.Random @@ -84,7 +83,7 @@ class YSP(var context: Context) { } private fun getTimeStr(): String { - return (Date().time / 1000).toString() + return getDateTimestamp().toString() } fun generateGuid(): String { diff --git a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt index 76111f4..7db1671 100644 --- a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt +++ b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt @@ -13,7 +13,6 @@ import androidx.media3.exoplayer.hls.HlsMediaSource import com.lizongying.mytv.TV import com.lizongying.mytv.Utils.getDateTimestamp import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program -import java.util.Date class TVViewModel(private var tv: TV) : ViewModel() { private var mapping = mapOf( @@ -232,7 +231,7 @@ class TVViewModel(private var tv: TV) : ViewModel() { private var rowPosition: Int = 0 private var itemPosition: Int = 0 - var programUpdateTime: Int = 0 + var programUpdateTime: Long = 0 private val _programId = MutableLiveData() val programId: LiveData @@ -379,13 +378,9 @@ class TVViewModel(private var tv: TV) : ViewModel() { return mapping[tv.title] } -// fun getProgram(): MutableList? { -// _program.value = (_program.value?.filter { it.et > (Date().time / 1000) })?.toMutableList() -// return _program.value?.subList(0, 2) -// } - fun getProgramOne(): Program? { - val programNew = (_program.value?.filter { it.et > (Date().time / 1000) })?.toMutableList() + val programNew = + (_program.value?.filter { it.et > getDateTimestamp() })?.toMutableList() if (programNew != null && _program.value != programNew) { _program.value = programNew } diff --git a/app/src/main/res/layout/info.xml b/app/src/main/res/layout/info.xml index 196df19..b3e3e69 100644 --- a/app/src/main/res/layout/info.xml +++ b/app/src/main/res/layout/info.xml @@ -32,14 +32,14 @@ android:layout_marginTop="0dp" android:gravity="start" android:textColor="#FFEEEEEE" - android:textSize="20sp" /> + android:textSize="22sp" />