logo

app/src/main/java/com/lizongying/mytv/CardPresenter.kt

@@ -31,37 +31,10 @@ class CardPresenter(
         cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
         cardView.tag = tvViewModel.videoUrl.value
 
-        when (tvViewModel.title.value) {
+        Glide.with(viewHolder.view.context)
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
+            .load(tvViewModel.logo.value)
-                .load(R.drawable.cctv8k)
+            .centerInside()
-                .centerInside()
+            .into(cardView.mainImageView)
-                .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)
-
-            "兵团卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.bingtuan)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "CETV1" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cetv1)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
 
         cardView.setBackgroundColor(Color.WHITE)
         cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)

app/src/main/java/com/lizongying/mytv/InfoFragment.kt

@@ -30,31 +30,9 @@ class InfoFragment : Fragment() {
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
 
-        when (tvViewModel.title.value) {
+        Glide.with(this)
-            "CCTV8K 超高清" -> Glide.with(this)
+            .load(tvViewModel.logo.value)
-                .load(R.drawable.cctv8k)
+            .into(binding.infoLogo)
-                .into(binding.infoLogo)
-
-            "天津卫视" -> Glide.with(this)
-                .load(R.drawable.tianjin)
-                .into(binding.infoLogo)
-
-            "新疆卫视" -> Glide.with(this)
-                .load(R.drawable.xinjiang)
-                .into(binding.infoLogo)
-
-            "兵团卫视" -> Glide.with(this)
-                .load(R.drawable.bingtuan)
-                .into(binding.infoLogo)
-
-            "CETV1" -> Glide.with(this)
-                .load(R.drawable.cetv1)
-                .into(binding.infoLogo)
-
-            else -> Glide.with(this)
-                .load(tvViewModel.logo.value)
-                .into(binding.infoLogo)
-        }
 
         val program = tvViewModel.getProgramOne()
         if (program != null) {

app/src/main/java/com/lizongying/mytv/TV.kt

@@ -9,7 +9,7 @@ data class TV(
     var videoUrl: List<String>,
     var videoIndex: Int = 0,
     var channel: String = "",
-    var logo: String = "",
+    var logo: Any = "",
     var pid: String = "",
     var sid: String = "",
     var programId: String = "",

app/src/main/java/com/lizongying/mytv/TVList.kt

@@ -292,7 +292,7 @@ object TVList {
                 listOf(),
                 0,
                 "央视",
-                "",
+                R.drawable.cctv8k,
                 "600156816",
                 "2020603421",
                 "",
@@ -838,7 +838,7 @@ object TVList {
                 listOf(),
                 0,
                 "地方",
-                "",
+                R.drawable.tianjin,
                 "600152137",
                 "2019927003",
                 "",
@@ -852,7 +852,7 @@ object TVList {
                 listOf(),
                 0,
                 "地方",
-                "",
+                R.drawable.xinjiang,
                 "600152138",
                 "2019927403",
                 "",
@@ -866,7 +866,7 @@ object TVList {
                 listOf(),
                 0,
                 "地方",
-                "",
+                R.drawable.bingtuan,
                 "600170344",
                 "2022606701",
                 "",
@@ -880,7 +880,7 @@ object TVList {
                 listOf(),
                 0,
                 "地方",
-                "",
+                R.drawable.cetv1,
                 "600171827",
                 "2022823801",
                 "",

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

@@ -53,8 +53,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _logo = MutableLiveData<String>()
+    private val _logo = MutableLiveData<Any>()
-    val logo: LiveData<String>
+    val logo: LiveData<Any>
         get() = _logo
 
     private val _pid = MutableLiveData<String>()
@@ -73,11 +73,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
-    private var mMinimumLoadableRetryCount = 5
-
     var seq = 0
 
-
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -114,10 +111,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _videoIndex.value = videoIndex
     }
 
-    fun setLogo(url: String) {
-        _logo.value = url
-    }
-
     init {
         _id.value = tv.id
         _title.value = tv.title
@@ -197,10 +190,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mHeaders = headers
     }
 
-    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
-        mMinimumLoadableRetryCount = minimumLoadableRetryCount
-    }
-
     /**
      * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
      */