compatible 16:10

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

@@ -85,7 +85,6 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-//            focusMainFragment()
             transaction.show(mainFragment)
         } else {
             transaction.hide(mainFragment)
@@ -94,10 +93,6 @@ class MainActivity : FragmentActivity() {
         transaction.commit()
     }
 
-    private fun focusMainFragment() {
-        mainFragment.focus()
-    }
-
     private fun mainFragmentIsHidden(): Boolean {
         return mainFragment.isHidden
     }

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

@@ -114,6 +114,10 @@ class MainFragment : BrowseSupportFragment() {
     override fun onDestroy() {
         super.onDestroy()
         handler.removeCallbacks(mUpdateProgramRunnable)
+        with(sharedPref!!.edit()) {
+            putInt("position", itemPosition)
+            apply()
+        }
     }
 
     fun updateProgram(tvViewModel: TVViewModel) {
@@ -202,7 +206,7 @@ class MainFragment : BrowseSupportFragment() {
         itemPosition = sharedPref?.getInt("position", 0)!!
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
-            savePosition(0)
+            tvListViewModel.setItemPosition(itemPosition)
         }
     }
 
@@ -227,21 +231,13 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
-    fun savePosition(position: Int) {
-        tvListViewModel.setItemPosition(position)
-        with(sharedPref!!.edit()) {
-            putInt("position", position)
-            apply()
-        }
-    }
-
     fun prev() {
         view?.post {
             itemPosition--
             if (itemPosition == -1) {
                 itemPosition = tvListViewModel.size() - 1
             }
-            savePosition(itemPosition)
+            tvListViewModel.setItemPosition(itemPosition)
 
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
             tvViewModel?.changed()
@@ -254,7 +250,7 @@ class MainFragment : BrowseSupportFragment() {
             if (itemPosition == tvListViewModel.size()) {
                 itemPosition = 0
             }
-            savePosition(itemPosition)
+            tvListViewModel.setItemPosition(itemPosition)
 
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
             tvViewModel?.changed()
@@ -310,7 +306,7 @@ class MainFragment : BrowseSupportFragment() {
             if (item is TVViewModel) {
                 if (itemPosition != item.id.value!!) {
                     itemPosition = item.id.value!!
-                    savePosition(itemPosition)
+                    tvListViewModel.setItemPosition(itemPosition)
 
                     val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
                     tvViewModel?.changed()

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -43,11 +44,20 @@ class PlayerFragment : Fragment() {
                     override fun onVideoSizeChanged(videoSize: VideoSize) {
                         val aspectRatio = 16f / 9f
                         val layoutParams = playerView?.layoutParams
-                        layoutParams?.width =
-                            (playerView?.measuredHeight?.times(aspectRatio))?.toInt()
-                        playerView?.layoutParams = layoutParams
+                        val ratio = playerView?.measuredWidth?.div(playerView?.measuredHeight!!)
+                        if (ratio != null) {
+                            if (ratio < aspectRatio) {
+                                layoutParams?.height =
+                                    (playerView?.measuredWidth?.div(aspectRatio))?.toInt()
+                                playerView?.layoutParams = layoutParams
+                            } else if (ratio > aspectRatio) {
+                                layoutParams?.width =
+                                    (playerView?.measuredHeight?.times(aspectRatio))?.toInt()
+                                playerView?.layoutParams = layoutParams
+                            }
+                        }
                     }
-//
+
 //                    override fun onPlayerError(error: PlaybackException) {
 //                            super.onPlayerError(error)
 //                    }

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

@@ -9,8 +9,6 @@ class TVListViewModel : ViewModel() {
 
     var maxNum = mutableListOf<Int>()
 
-    private var sharedPref: SharedPreferences? = null
-
     private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
 
     private val _itemPosition = MutableLiveData<Int>()
@@ -48,13 +46,6 @@ class TVListViewModel : ViewModel() {
         _itemPositionCurrent.value = position
     }
 
-    fun savePosition(position: Int) {
-        with(sharedPref!!.edit()) {
-            putInt("position", position)
-            apply()
-        }
-    }
-
     fun size(): Int {
         return tvListViewModel.value!!.size
     }

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#223239</color>
+</resources>