diff --git a/app/build.gradle b/app/build.gradle index 0c6de0194..2808f6989 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "ani.saikou" minSdk 21 targetSdk 31 - versionCode 12 - versionName "1.0.10" + versionCode 13 + versionName "1.0.11" signingConfig signingConfigs.debug } diff --git a/app/src/main/java/ani/saikou/tv/TVMediaPlayer.kt b/app/src/main/java/ani/saikou/tv/TVMediaPlayer.kt index 55aeb6f87..f1942739e 100644 --- a/app/src/main/java/ani/saikou/tv/TVMediaPlayer.kt +++ b/app/src/main/java/ani/saikou/tv/TVMediaPlayer.kt @@ -57,11 +57,13 @@ import java.util.concurrent.TimeUnit import kotlin.math.max import kotlin.math.roundToInt -class TVMediaPlayer(var media: Media): VideoSupportFragment(), VideoPlayerGlue.OnActionClickedListener, Player.Listener { +class TVMediaPlayer: VideoSupportFragment(), VideoPlayerGlue.OnActionClickedListener, Player.Listener { private val resumeWindow = "resumeWindow" private val resumePosition = "resumePosition" + lateinit var media: Media + private lateinit var exoPlayer: ExoPlayer private lateinit var cacheFactory : CacheDataSource.Factory private lateinit var playbackParameters: PlaybackParameters @@ -430,7 +432,7 @@ class TVMediaPlayer(var media: Media): VideoSupportFragment(), VideoPlayerGlue.O val watchNextID = sharedPref.getString(TVMainActivity.watchNextChannelIDKey, null) watchNextID?.let { - requireContext().contentResolver.update(Uri.parse(it), builder.build().toContentValues(), null) + requireContext().contentResolver.update(Uri.parse(it), builder.build().toContentValues(), null, null) } ?: run { val watchNextProgramUri = requireContext().contentResolver .insert(TvContractCompat.WatchNextPrograms.CONTENT_URI, diff --git a/app/src/main/java/ani/saikou/tv/TVSearchFragment.kt b/app/src/main/java/ani/saikou/tv/TVSearchFragment.kt index 097b557c5..87fc9b279 100644 --- a/app/src/main/java/ani/saikou/tv/TVSearchFragment.kt +++ b/app/src/main/java/ani/saikou/tv/TVSearchFragment.kt @@ -39,7 +39,7 @@ import kotlinx.coroutines.launch import java.io.Serializable import java.util.* -class TVSearchFragment(): SearchFragment(), SearchSupportFragment.SearchResultProvider { +class TVSearchFragment: SearchFragment(), SearchSupportFragment.SearchResultProvider { private val PAGING_THRESHOLD = 40 diff --git a/app/src/main/java/ani/saikou/tv/TVSelectorFragment.kt b/app/src/main/java/ani/saikou/tv/TVSelectorFragment.kt index ec40a2351..859610050 100644 --- a/app/src/main/java/ani/saikou/tv/TVSelectorFragment.kt +++ b/app/src/main/java/ani/saikou/tv/TVSelectorFragment.kt @@ -82,7 +82,9 @@ class TVSelectorFragment(var media: Media, val fromPlayer: Boolean): VerticalGri } fun startExoplayer(media: Media){ - requireActivity().supportFragmentManager.beginTransaction().addToBackStack(null).replace(R.id.main_detail_fragment, TVMediaPlayer(media)).commit() + val player = TVMediaPlayer() + player.media = media + requireActivity().supportFragmentManager.beginTransaction().addToBackStack(null).replace(R.id.main_detail_fragment, player).commit() } fun cancel() { diff --git a/stable.txt b/stable.txt index 7ee7020b3..59e9e6049 100644 --- a/stable.txt +++ b/stable.txt @@ -1 +1 @@ -1.0.10 +1.0.11