Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
kehaoyuan
2020-06-29 16:58:06 +08:00
parent f152296e7a 4ccc789c7c
commit 8a97844676
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
View File

@ -964,6 +964,9 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
mPlayRetryCount = 0
unObserveVolume(context as AppCompatActivity)
mScheduledHideDisposable?.dispose()
mScheduledHideDisposable = null
}
}

4
app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt
View File

@ -84,7 +84,6 @@ class VideoAdapter(val mContext: Context, val mRecyclerView: RecyclerView, val m
videoView.updateViewDetail(videoList[position])
videoView.updateThumb(videoList[position].getThumb())
videoView.updateMuteStatus()
videoView.observeVolume(mContext as AppCompatActivity)
videoView.fullscreenButton.setOnClickListener {
if (mOrientationUtils.isLand == 0) {
videoView.recordMta("进入全屏")
@ -94,7 +93,7 @@ class VideoAdapter(val mContext: Context, val mRecyclerView: RecyclerView, val m
videoView.hideAllButton(true)
mOrientationUtils.resolveByClick()
val fullVideoPlayer = videoView.startWindowFullscreen(mContext, true, true) as DetailPlayerView
fullVideoPlayer.observeVolume(mContext)
fullVideoPlayer.observeVolume(mContext as AppCompatActivity)
fullVideoPlayer.setViewModel(mViewModel)
fullVideoPlayer.hideAllButton(true)
fullVideoPlayer.updateViewDetail(videoList[position])
@ -118,6 +117,7 @@ class VideoAdapter(val mContext: Context, val mRecyclerView: RecyclerView, val m
ExoCacheManager.preload(videoList[position + 1].url)
Picasso.with(mContext).load(videoList[position + 1].getThumb()).fetch()
}
videoView.observeVolume(mContext as AppCompatActivity)
videoView.startButton.performClick()
mViewModel.addHistoryRecord(videoList[position])
VideoRecordUtils.log(videoList[position].id)