From 7821e8fa588f403646c8a4ad78948d4455511981 Mon Sep 17 00:00:00 2001
From: Li ZongYing <lizongying@msn.com>
Date: Thu, 11 Jan 2024 15:19:57 +0800
Subject: [PATCH] optimize

---
 app/build.gradle                                         | 9 ++++++---
 app/src/main/java/com/lizongying/mytv/PlayerFragment.kt  | 4 ++--
 app/src/main/java/com/lizongying/mytv/Request.kt         | 3 +--
 .../java/com/lizongying/mytv/models/TVListViewModel.kt   | 1 -
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7c70441..0154aac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,10 +100,13 @@ dependencies {
     // For HLS playback support with ExoPlayer
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
+    // 21:2.9.0 17:2.6.4
+    def retrofit2_version = "2.9.0"
+
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-protobuf:2.9.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
+    implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
     implementation 'androidx.core:core-ktx:1.11.0-beta02'
     implementation 'androidx.leanback:leanback:1.2.0-alpha02'
diff --git a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
index 5fdfeb3..77b5557 100644
--- a/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
+++ b/app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
@@ -24,6 +24,7 @@ class PlayerFragment : Fragment() {
     private var _binding: PlayerBinding? = null
     private var playerView: PlayerView? = null
     private var tvViewModel: TVViewModel? = null
+    private val aspectRatio = 16f / 9f
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -43,10 +44,9 @@ class PlayerFragment : Fragment() {
                 playerView!!.player?.playWhenReady = true
                 playerView!!.player?.addListener(object : Player.Listener {
                     override fun onVideoSizeChanged(videoSize: VideoSize) {
-                        val aspectRatio = 16f / 9f
-                        val layoutParams = playerView?.layoutParams
                         val ratio = playerView?.measuredWidth?.div(playerView?.measuredHeight!!)
                         if (ratio != null) {
+                            val layoutParams = playerView?.layoutParams
                             if (ratio < aspectRatio) {
                                 layoutParams?.height =
                                     (playerView?.measuredWidth?.div(aspectRatio))?.toInt()
diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt
index 836a0d5..e408f91 100644
--- a/app/src/main/java/com/lizongying/mytv/Request.kt
+++ b/app/src/main/java/com/lizongying/mytv/Request.kt
@@ -169,8 +169,7 @@ class Request {
             .enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful) {
-                        val info = response.body()
-                        val token = info?.data?.token
+                        val token = response.body()?.data?.token
                         Log.i(TAG, "info success $token")
                         val cookie =
                             "guid=1; vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
diff --git a/app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt b/app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt
index 138b937..1384f93 100644
--- a/app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt
+++ b/app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt
@@ -1,6 +1,5 @@
 package com.lizongying.mytv.models
 
-import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel