mirror of
https://github.com/lizongying/my-tv.git
synced 2026-11-04 02:26:34 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4bdc625718 | ||
|
|
cda19995b2 | ||
|
|
1eb2f257b5 | ||
|
|
9feb0dc4bc | ||
|
|
46311036d6 | ||
|
|
1aade3a48d | ||
|
|
2528cf33db | ||
|
|
4364f66ec5 | ||
|
|
49cd7b3af2 |
@@ -14,20 +14,16 @@
|
|||||||
|
|
||||||
## 更新日志
|
## 更新日志
|
||||||
|
|
||||||
### v1.4.9(高版本专用)
|
|
||||||
|
|
||||||
* 同步v1.4.8
|
|
||||||
|
|
||||||
### v1.4.8(通用版)
|
### v1.4.8(通用版)
|
||||||
|
|
||||||
* 频道号从1开始,CCTV5+为18
|
* 频道号从1开始,cctv5+为18
|
||||||
* 提高CCTV6清晰度
|
* 提高cctv6清晰度
|
||||||
* 增加天津卫视、新疆卫视
|
* 增加天津卫视、新疆卫视
|
||||||
|
|
||||||
### v1.4.7(高版本专用)
|
### v1.4.7(高版本专用)
|
||||||
|
|
||||||
* 修复部分用户CCTV13播放过程中卡住的问题
|
* 修复部分用户cctv13播放过程中卡住的问题
|
||||||
* 调整CCTV的频道顺序
|
* 调整cctv的频道顺序
|
||||||
|
|
||||||
### v1.4.6(通用版)
|
### v1.4.6(通用版)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -101,7 +101,7 @@ dependencies {
|
|||||||
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
|
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
|
||||||
|
|
||||||
// 21:2.9.0 17:2.6.4
|
// 21:2.9.0 17:2.6.4
|
||||||
def retrofit2_version = "2.9.0"
|
def retrofit2_version = "2.6.4"
|
||||||
|
|
||||||
implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
|
implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
|
||||||
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
|
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,119 @@
|
|||||||
|
package com.lizongying.mytv
|
||||||
|
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.view.ContextThemeWrapper
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.view.animation.ScaleAnimation
|
||||||
|
import android.widget.ImageView
|
||||||
|
import androidx.leanback.widget.ImageCardView
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.bumptech.glide.Glide
|
||||||
|
import com.lizongying.mytv.models.TVListViewModel
|
||||||
|
import com.lizongying.mytv.models.TVViewModel
|
||||||
|
|
||||||
|
|
||||||
|
class CardAdapter(private val owner: LifecycleOwner, private var tvListViewModel: TVListViewModel) :
|
||||||
|
RecyclerView.Adapter<CardAdapter.ViewHolder>() {
|
||||||
|
|
||||||
|
private var listener: ItemListener? = null
|
||||||
|
|
||||||
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
|
val cardView = object :
|
||||||
|
ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
|
||||||
|
startScaleAnimation(cardView, 1.0f, 0.9f)
|
||||||
|
cardView.isFocusable = true
|
||||||
|
cardView.isFocusableInTouchMode = true
|
||||||
|
|
||||||
|
return ViewHolder(cardView)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float) {
|
||||||
|
val scaleAnimation = ScaleAnimation(
|
||||||
|
fromScale, toScale,
|
||||||
|
fromScale, toScale,
|
||||||
|
ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
|
||||||
|
ScaleAnimation.RELATIVE_TO_SELF, 0.5f
|
||||||
|
)
|
||||||
|
scaleAnimation.duration = 200
|
||||||
|
scaleAnimation.fillAfter = true
|
||||||
|
|
||||||
|
view.startAnimation(scaleAnimation)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
|
||||||
|
val item = tvListViewModel.getTVViewModel(position)
|
||||||
|
|
||||||
|
val tvViewModel = item as TVViewModel
|
||||||
|
val cardView = viewHolder.view as ImageCardView
|
||||||
|
|
||||||
|
cardView.setOnFocusChangeListener { _, hasFocus ->
|
||||||
|
listener?.onItemFocusChange(item, hasFocus)
|
||||||
|
if (hasFocus) {
|
||||||
|
startScaleAnimation(cardView, 0.9f, 1.0f)
|
||||||
|
} else {
|
||||||
|
startScaleAnimation(cardView, 1.0f, 0.9f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cardView.setOnClickListener { _ ->
|
||||||
|
listener?.onItemClicked(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
cardView.titleText = tvViewModel.title.value
|
||||||
|
cardView.tag = tvViewModel.videoUrl.value
|
||||||
|
|
||||||
|
when (tvViewModel.title.value) {
|
||||||
|
"CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(R.drawable.cctv8k)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
|
||||||
|
"天津卫视" -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(R.drawable.tianjin)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
|
||||||
|
"新疆卫视" -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(R.drawable.xinjiang)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
|
||||||
|
else -> Glide.with(viewHolder.view.context)
|
||||||
|
.load(tvViewModel.logo.value)
|
||||||
|
.centerInside()
|
||||||
|
.into(cardView.mainImageView)
|
||||||
|
}
|
||||||
|
|
||||||
|
cardView.mainImageView.setBackgroundColor(Color.WHITE)
|
||||||
|
cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
|
||||||
|
|
||||||
|
tvViewModel.program.observe(owner) { _ ->
|
||||||
|
val program = tvViewModel.getProgramOne()
|
||||||
|
if (program != null) {
|
||||||
|
cardView.contentText = program.name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getItemCount() = tvListViewModel.size()
|
||||||
|
|
||||||
|
class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
|
||||||
|
val view = itemView
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ItemListener {
|
||||||
|
fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
|
||||||
|
fun onItemClicked(tvViewModel: TVViewModel)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setItemListener(listener: ItemListener) {
|
||||||
|
this.listener = listener
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "CardAdapter"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -48,6 +48,7 @@ class InfoFragment : Fragment() {
|
|||||||
.into(binding.infoLogo)
|
.into(binding.infoLogo)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val program = tvViewModel.getProgramOne()
|
val program = tvViewModel.getProgramOne()
|
||||||
if (program != null) {
|
if (program != null) {
|
||||||
binding.infoDesc.text = program.name
|
binding.infoDesc.text = program.name
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ class MainActivity : FragmentActivity() {
|
|||||||
val transaction = supportFragmentManager.beginTransaction()
|
val transaction = supportFragmentManager.beginTransaction()
|
||||||
|
|
||||||
if (mainFragment.isHidden) {
|
if (mainFragment.isHidden) {
|
||||||
|
mainFragment.setPosition()
|
||||||
transaction.show(mainFragment)
|
transaction.show(mainFragment)
|
||||||
keepRunnable()
|
keepRunnable()
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -6,30 +6,31 @@ import android.os.Bundle
|
|||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.leanback.app.BrowseSupportFragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.leanback.widget.ArrayObjectAdapter
|
|
||||||
import androidx.leanback.widget.HeaderItem
|
|
||||||
import androidx.leanback.widget.ListRow
|
|
||||||
import androidx.leanback.widget.ListRowPresenter
|
|
||||||
import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
|
|
||||||
import androidx.leanback.widget.OnItemViewClickedListener
|
|
||||||
import androidx.leanback.widget.OnItemViewSelectedListener
|
|
||||||
import androidx.leanback.widget.Presenter
|
|
||||||
import androidx.leanback.widget.Row
|
|
||||||
import androidx.leanback.widget.RowPresenter
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.lizongying.mytv.Utils.dpToPx
|
||||||
import com.lizongying.mytv.Utils.getDateTimestamp
|
import com.lizongying.mytv.Utils.getDateTimestamp
|
||||||
|
import com.lizongying.mytv.databinding.RowBinding
|
||||||
|
import com.lizongying.mytv.databinding.ShowBinding
|
||||||
import com.lizongying.mytv.models.TVListViewModel
|
import com.lizongying.mytv.models.TVListViewModel
|
||||||
import com.lizongying.mytv.models.TVViewModel
|
import com.lizongying.mytv.models.TVViewModel
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class MainFragment : BrowseSupportFragment() {
|
class MainFragment : Fragment(), CardAdapter.ItemListener {
|
||||||
|
|
||||||
private var itemPosition = 0
|
private var itemPosition = 0
|
||||||
|
|
||||||
private var rowsAdapter: ArrayObjectAdapter? = null
|
private var rowList: MutableList<View> = mutableListOf()
|
||||||
|
|
||||||
|
private var _binding: ShowBinding? = null
|
||||||
|
private val binding get() = _binding!!
|
||||||
|
|
||||||
private var request = Request()
|
private var request = Request()
|
||||||
|
|
||||||
@@ -44,9 +45,12 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
|
|
||||||
private var ready = 0
|
private var ready = 0
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreateView(
|
||||||
super.onCreate(savedInstanceState)
|
inflater: LayoutInflater, container: ViewGroup?,
|
||||||
headersState = HEADERS_DISABLED
|
savedInstanceState: Bundle?
|
||||||
|
): View {
|
||||||
|
_binding = ShowBinding.inflate(inflater, container, false)
|
||||||
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
override fun onActivityCreated(savedInstanceState: Bundle?) {
|
||||||
@@ -55,172 +59,140 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
activity?.let { request.initYSP(it) }
|
activity?.let { request.initYSP(it) }
|
||||||
sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
|
sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
|
||||||
|
|
||||||
loadRows()
|
view?.post {
|
||||||
|
val content = binding.content
|
||||||
|
|
||||||
setupEventListeners()
|
var idx: Long = 0
|
||||||
|
for ((k, v) in TVList.list) {
|
||||||
|
val itemBinding: RowBinding =
|
||||||
|
RowBinding.inflate(layoutInflater, content, false)
|
||||||
|
|
||||||
mUpdateProgramRunnable = UpdateProgramRunnable()
|
val tvListViewModelCurrent = TVListViewModel()
|
||||||
handler.post(mUpdateProgramRunnable)
|
for ((idx2, v1) in v.withIndex()) {
|
||||||
|
val tvViewModel = TVViewModel(v1)
|
||||||
tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
|
tvViewModel.setRowPosition(idx.toInt())
|
||||||
tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
|
tvViewModel.setItemPosition(idx2)
|
||||||
if (tvViewModel.errInfo.value != null
|
tvListViewModelCurrent.addTVViewModel(tvViewModel)
|
||||||
&& tvViewModel.id.value == itemPosition
|
tvListViewModel.addTVViewModel(tvViewModel)
|
||||||
) {
|
|
||||||
Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
}
|
||||||
}
|
tvListViewModel.maxNum.add(v.size)
|
||||||
tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
|
|
||||||
|
|
||||||
// not first time && channel not change
|
val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
|
||||||
if (tvViewModel.ready.value != null
|
rowList.add(itemBinding.rowItems)
|
||||||
&& tvViewModel.id.value == itemPosition
|
|
||||||
&& check(tvViewModel)
|
adapter.setItemListener(this)
|
||||||
) {
|
|
||||||
Log.i(TAG, "ready ${tvViewModel.title.value}")
|
itemBinding.rowHeader.text = k
|
||||||
(activity as? MainActivity)?.play(tvViewModel)
|
itemBinding.rowItems.adapter = adapter
|
||||||
}
|
itemBinding.rowItems.layoutManager =
|
||||||
|
LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
|
||||||
|
|
||||||
|
val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
|
||||||
|
layoutParams.topMargin = dpToPx(11F)
|
||||||
|
itemBinding.row.layoutParams = layoutParams
|
||||||
|
content.addView(itemBinding.row)
|
||||||
|
|
||||||
|
idx++
|
||||||
}
|
}
|
||||||
tvViewModel.change.observe(viewLifecycleOwner) { _ ->
|
|
||||||
if (tvViewModel.change.value != null) {
|
mUpdateProgramRunnable = UpdateProgramRunnable()
|
||||||
val title = tvViewModel.title.value
|
handler.post(mUpdateProgramRunnable)
|
||||||
Log.i(TAG, "switch $title")
|
|
||||||
if (tvViewModel.pid.value != "") {
|
itemPosition = sharedPref?.getInt(POSITION, 0)!!
|
||||||
Log.i(TAG, "request $title ${tvViewModel.pid.value}")
|
if (itemPosition >= tvListViewModel.size()) {
|
||||||
lifecycleScope.launch(Dispatchers.IO) {
|
itemPosition = 0
|
||||||
tvViewModel.let { request.fetchData(it) }
|
}
|
||||||
}
|
tvListViewModel.setItemPosition(itemPosition)
|
||||||
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
setPosition()
|
||||||
setSelectedPosition(
|
tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
|
||||||
tvViewModel.getRowPosition(), true,
|
tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
|
||||||
SelectItemViewHolderTask(tvViewModel.getItemPosition())
|
if (tvViewModel.errInfo.value != null
|
||||||
)
|
&& tvViewModel.id.value == itemPosition
|
||||||
} else {
|
) {
|
||||||
if (check(tvViewModel)) {
|
Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
|
||||||
(activity as? MainActivity)?.play(tvViewModel)
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
|
||||||
|
|
||||||
|
// not first time && channel not change
|
||||||
|
if (tvViewModel.ready.value != null
|
||||||
|
&& tvViewModel.id.value == itemPosition
|
||||||
|
&& check(tvViewModel)
|
||||||
|
) {
|
||||||
|
Log.i(TAG, "ready ${tvViewModel.title.value}")
|
||||||
|
(activity as? MainActivity)?.play(tvViewModel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tvViewModel.change.observe(viewLifecycleOwner) { _ ->
|
||||||
|
if (tvViewModel.change.value != null) {
|
||||||
|
val title = tvViewModel.title.value
|
||||||
|
Log.i(TAG, "switch $title")
|
||||||
|
if (tvViewModel.pid.value != "") {
|
||||||
|
Log.i(TAG, "request $title ${tvViewModel.pid.value}")
|
||||||
|
lifecycleScope.launch(Dispatchers.IO) {
|
||||||
|
tvViewModel.let { request.fetchData(it) }
|
||||||
|
}
|
||||||
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
||||||
setSelectedPosition(
|
setPosition(
|
||||||
tvViewModel.getRowPosition(), true,
|
tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
|
||||||
SelectItemViewHolderTask(tvViewModel.getItemPosition())
|
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
if (check(tvViewModel)) {
|
||||||
|
(activity as? MainActivity)?.play(tvViewModel)
|
||||||
|
(activity as? MainActivity)?.showInfoFragment(tvViewModel)
|
||||||
|
setPosition(
|
||||||
|
tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fragmentReady()
|
fragmentReady()
|
||||||
}
|
|
||||||
|
|
||||||
fun toLastPosition() {
|
|
||||||
setSelectedPosition(
|
|
||||||
selectedPosition, false,
|
|
||||||
SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun toFirstPosition() {
|
|
||||||
setSelectedPosition(
|
|
||||||
selectedPosition, false,
|
|
||||||
SelectItemViewHolderTask(0)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun startHeadersTransition(withHeaders: Boolean) {
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun loadRows() {
|
|
||||||
rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
|
|
||||||
|
|
||||||
val cardPresenter = CardPresenter(viewLifecycleOwner)
|
|
||||||
|
|
||||||
var idx: Long = 0
|
|
||||||
for ((k, v) in TVList.list) {
|
|
||||||
val listRowAdapter = ArrayObjectAdapter(cardPresenter)
|
|
||||||
for ((idx2, v1) in v.withIndex()) {
|
|
||||||
val tvViewModel = TVViewModel(v1)
|
|
||||||
tvViewModel.setRowPosition(idx.toInt())
|
|
||||||
tvViewModel.setItemPosition(idx2)
|
|
||||||
tvListViewModel.addTVViewModel(tvViewModel)
|
|
||||||
listRowAdapter.add(tvViewModel)
|
|
||||||
}
|
|
||||||
tvListViewModel.maxNum.add(v.size)
|
|
||||||
val header = HeaderItem(idx, k)
|
|
||||||
rowsAdapter!!.add(ListRow(header, listRowAdapter))
|
|
||||||
idx++
|
|
||||||
}
|
|
||||||
|
|
||||||
adapter = rowsAdapter
|
|
||||||
|
|
||||||
itemPosition = sharedPref?.getInt(POSITION, 0)!!
|
|
||||||
if (itemPosition >= tvListViewModel.size()) {
|
|
||||||
itemPosition = 0
|
|
||||||
}
|
|
||||||
tvListViewModel.setItemPosition(itemPosition)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun prevSource() {
|
|
||||||
view?.post {
|
|
||||||
val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
|
|
||||||
if (tvViewModel != null) {
|
|
||||||
if (tvViewModel.videoUrl.value!!.size > 1) {
|
|
||||||
val videoIndex = tvViewModel.videoIndex.value?.minus(1)
|
|
||||||
if (videoIndex == -1) {
|
|
||||||
tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
|
|
||||||
}
|
|
||||||
tvViewModel.changed()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun nextSource() {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
view?.post {
|
super.onViewCreated(view, savedInstanceState)
|
||||||
val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
|
}
|
||||||
if (tvViewModel != null) {
|
|
||||||
if (tvViewModel.videoUrl.value!!.size > 1) {
|
override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
|
||||||
val videoIndex = tvViewModel.videoIndex.value?.plus(1)
|
if (hasFocus) {
|
||||||
if (videoIndex == tvViewModel.videoUrl.value!!.size) {
|
tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
|
||||||
tvViewModel.setVideoIndex(0)
|
(activity as MainActivity).keepRunnable()
|
||||||
}
|
|
||||||
tvViewModel.changed()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupEventListeners() {
|
override fun onItemClicked(tvViewModel: TVViewModel) {
|
||||||
onItemViewClickedListener = ItemViewClickedListener()
|
if (this.isHidden) {
|
||||||
onItemViewSelectedListener = ItemViewSelectedListener()
|
(activity as? MainActivity)?.switchMainFragment()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemPosition != tvViewModel.id.value!!) {
|
||||||
|
itemPosition = tvViewModel.id.value!!
|
||||||
|
tvListViewModel.setItemPosition(itemPosition)
|
||||||
|
tvListViewModel.getTVViewModel(itemPosition)?.changed()
|
||||||
|
}
|
||||||
|
(activity as? MainActivity)?.switchMainFragment()
|
||||||
}
|
}
|
||||||
|
|
||||||
private inner class ItemViewClickedListener : OnItemViewClickedListener {
|
fun setPosition() {
|
||||||
override fun onItemClicked(
|
val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
|
||||||
itemViewHolder: Presenter.ViewHolder,
|
rowList[tvViewModel!!.getRowPosition()].post {
|
||||||
item: Any,
|
((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
|
||||||
rowViewHolder: RowPresenter.ViewHolder,
|
tvViewModel.getItemPosition()
|
||||||
row: Row
|
)?.requestFocus()
|
||||||
) {
|
|
||||||
if (item is TVViewModel) {
|
|
||||||
if (itemPosition != item.id.value!!) {
|
|
||||||
itemPosition = item.id.value!!
|
|
||||||
tvListViewModel.setItemPosition(itemPosition)
|
|
||||||
tvListViewModel.getTVViewModel(itemPosition)?.changed()
|
|
||||||
}
|
|
||||||
(activity as? MainActivity)?.switchMainFragment()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
|
fun setPosition(rowPosition: Int, itemPosition: Int) {
|
||||||
override fun onItemSelected(
|
rowList[rowPosition].post {
|
||||||
itemViewHolder: Presenter.ViewHolder?, item: Any?,
|
((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
|
||||||
rowViewHolder: RowPresenter.ViewHolder, row: Row
|
itemPosition
|
||||||
) {
|
)?.requestFocus()
|
||||||
if (item is TVViewModel) {
|
|
||||||
tvListViewModel.setItemPositionCurrent(item.id.value!!)
|
|
||||||
(activity as MainActivity).keepRunnable()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -290,7 +262,7 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
tvViewModel.programUpdateTime = timestamp
|
tvViewModel.programUpdateTime = timestamp
|
||||||
request.fetchProgram(tvViewModel)
|
request.fetchProgram(tvViewModel)
|
||||||
} else {
|
} else {
|
||||||
if (tvViewModel.program.value!!.last().et - timestamp < 600) {
|
if (timestamp - tvViewModel.program.value!!.last().et < 600) {
|
||||||
tvViewModel.programUpdateTime = timestamp
|
tvViewModel.programUpdateTime = timestamp
|
||||||
request.fetchProgram(tvViewModel)
|
request.fetchProgram(tvViewModel)
|
||||||
}
|
}
|
||||||
@@ -300,7 +272,7 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
|
|
||||||
inner class UpdateProgramRunnable : Runnable {
|
inner class UpdateProgramRunnable : Runnable {
|
||||||
override fun run() {
|
override fun run() {
|
||||||
tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null }
|
tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
|
||||||
?.forEach { tvViewModel ->
|
?.forEach { tvViewModel ->
|
||||||
updateProgram(
|
updateProgram(
|
||||||
tvViewModel
|
tvViewModel
|
||||||
@@ -326,6 +298,12 @@ class MainFragment : BrowseSupportFragment() {
|
|||||||
handler.removeCallbacks(mUpdateProgramRunnable)
|
handler.removeCallbacks(mUpdateProgramRunnable)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onDestroyView() {
|
||||||
|
Log.i(TAG, "onDestroyView")
|
||||||
|
super.onDestroyView()
|
||||||
|
_binding = null
|
||||||
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
view?.post { view?.requestFocus() }
|
view?.post { view?.requestFocus() }
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ class Request {
|
|||||||
keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
|
keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
|
||||||
ivBytes
|
ivBytes
|
||||||
).uppercase()
|
).uppercase()
|
||||||
Log.d(TAG, "$title url $url")
|
Log.i(TAG, "$title url $url")
|
||||||
tvModel.addVideoUrl(url)
|
tvModel.addVideoUrl(url)
|
||||||
tvModel.allReady()
|
tvModel.allReady()
|
||||||
tvModel.retryTimes = 0
|
tvModel.retryTimes = 0
|
||||||
|
|||||||
@@ -8,9 +8,7 @@ class TVListViewModel : ViewModel() {
|
|||||||
|
|
||||||
var maxNum = mutableListOf<Int>()
|
var maxNum = mutableListOf<Int>()
|
||||||
|
|
||||||
private val _tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
|
private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
|
||||||
val tvListViewModel: LiveData<MutableList<TVViewModel>>
|
|
||||||
get() = _tvListViewModel
|
|
||||||
|
|
||||||
private val _itemPosition = MutableLiveData<Int>()
|
private val _itemPosition = MutableLiveData<Int>()
|
||||||
val itemPosition: LiveData<Int>
|
val itemPosition: LiveData<Int>
|
||||||
@@ -20,20 +18,22 @@ class TVListViewModel : ViewModel() {
|
|||||||
val itemPositionCurrent: LiveData<Int>
|
val itemPositionCurrent: LiveData<Int>
|
||||||
get() = _itemPositionCurrent
|
get() = _itemPositionCurrent
|
||||||
|
|
||||||
|
fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
|
||||||
|
return tvListViewModel
|
||||||
|
}
|
||||||
|
|
||||||
fun addTVViewModel(tvViewModel: TVViewModel) {
|
fun addTVViewModel(tvViewModel: TVViewModel) {
|
||||||
if (_tvListViewModel.value == null) {
|
val currentTVModelList = tvListViewModel.value ?: mutableListOf()
|
||||||
_tvListViewModel.value = mutableListOf(tvViewModel)
|
currentTVModelList.add(tvViewModel)
|
||||||
} else {
|
tvListViewModel.value = currentTVModelList
|
||||||
_tvListViewModel.value?.add(tvViewModel)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getTVViewModel(id: Int): TVViewModel? {
|
fun getTVViewModel(id: Int): TVViewModel? {
|
||||||
return _tvListViewModel.value?.get(id)
|
return tvListViewModel.value?.get(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getTVViewModelCurrent(): TVViewModel? {
|
fun getTVViewModelCurrent(): TVViewModel? {
|
||||||
return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
|
return _itemPositionCurrent.value?.let { tvListViewModel.value?.get(it) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setItemPosition(position: Int) {
|
fun setItemPosition(position: Int) {
|
||||||
@@ -46,9 +46,6 @@ class TVListViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun size(): Int {
|
fun size(): Int {
|
||||||
if (_tvListViewModel.value == null) {
|
return tvListViewModel.value!!.size
|
||||||
return 0
|
|
||||||
}
|
|
||||||
return _tvListViewModel.value!!.size
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -78,7 +78,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
|
|||||||
var needToken = false
|
var needToken = false
|
||||||
|
|
||||||
private val channelsNeedToken = arrayOf(
|
private val channelsNeedToken = arrayOf(
|
||||||
// "CCTV4K 超高清",
|
|
||||||
"CCTV3 综艺",
|
"CCTV3 综艺",
|
||||||
"CCTV6 电影",
|
"CCTV6 电影",
|
||||||
"CCTV8 电视剧",
|
"CCTV8 电视剧",
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/row"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/row_header"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="start"
|
||||||
|
android:layout_marginTop="0dp"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:gravity="start"
|
||||||
|
android:textColor="#FFEEEEEE"
|
||||||
|
android:textSize="22sp" />
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/row_items"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
</androidx.recyclerview.widget.RecyclerView>
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/show_fragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
<ScrollView
|
||||||
|
android:id="@+id/scroll_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/content"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</FrameLayout>
|
||||||
@@ -1,10 +1,25 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
|
<style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
|
||||||
<item name="lbImageCardViewType">Title|Content</item>
|
<item name="cardType">infoUnder</item>
|
||||||
|
<item name="infoVisibility">always</item>
|
||||||
|
<!-- In order to keep backward compatibility we have to create an icon on right. -->
|
||||||
|
<item name="lbImageCardViewType">Title|Content|IconOnRight</item>
|
||||||
|
<!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
|
||||||
|
<item name="infoAreaBackground">@null</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
|
||||||
|
<item name="android:layout_width">143dp</item>
|
||||||
|
<item name="android:layout_height">50dp</item>
|
||||||
|
<item name="android:adjustViewBounds">true</item>
|
||||||
|
<item name="android:contentDescription">@null</item>
|
||||||
|
<item name="android:scaleType">centerCrop</item>
|
||||||
|
<item name="layout_viewType">main</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="CustomImageCardTheme" parent="Theme.Leanback">
|
<style name="CustomImageCardTheme" parent="Theme.Leanback">
|
||||||
<item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
|
<item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
|
||||||
|
<item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
Reference in New Issue
Block a user