Ling0925
/
my-tv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some info style

This commit is contained in:
Li ZongYing 2023-12-29 10:44:58 +08:00
parent 3eb6757543
commit 286cec465a
7 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/lizongying/mytv/InfoFragment.kt
View File

@ -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
}

41
app/src/main/java/com/lizongying/mytv/MainActivity.kt
View File

@ -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()
//// }
// }
}
}

12
app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
View File

@ -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()
}
}

4
app/src/main/java/com/lizongying/mytv/Utils.kt
View File

@ -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
}
}

5
app/src/main/java/com/lizongying/mytv/api/YSP.kt
View File

@ -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 {

11
app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt
View File

@ -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<String>()
val programId: LiveData<String>
@ -379,13 +378,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
return mapping[tv.title]
}
// fun getProgram(): MutableList<Program>? {
// _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
}

4
app/src/main/res/layout/info.xml
View File

@ -32,14 +32,14 @@
android:layout_marginTop="0dp"
android:gravity="start"
android:textColor="#FFEEEEEE"
android:textSize="20sp" />
android:textSize="22sp" />
<TextView
android:id="@+id/info_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="10dp"
android:layout_marginTop="8dp"
android:gravity="start"
android:singleLine="true"
android:textColor="#B3EEEEEE"