compatible 16:10

pull/102/head^2
Li ZongYing 2 years ago
parent 58ca2dc480
commit d4cc6bc64c
  1. BIN
      app/src/main/ic_launcher-playstore.png
  2. 5
      app/src/main/java/com/lizongying/mytv/MainActivity.kt
  3. 20
      app/src/main/java/com/lizongying/mytv/MainFragment.kt
  4. 18
      app/src/main/java/com/lizongying/mytv/PlayerFragment.kt
  5. 9
      app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt
  6. 5
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  7. 5
      app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  8. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.webp
  9. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
  10. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
  11. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.webp
  12. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
  13. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
  14. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.webp
  15. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
  16. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
  17. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
  18. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
  19. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
  20. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
  21. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
  22. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
  23. 4
      app/src/main/res/values/ic_launcher_background.xml

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 25 KiB

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

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

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

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

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

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