remember play position for offline video

Author: blackbbc

README.md

@@ -44,19 +44,6 @@
 <a href="art/18.png"><img src="art/18.png" width="30%"/></a>
 
 ## 待做列表
-- [x] 修复：Android6.0以下机型更新失败的问题（V1.1.2）
-- [x] 修复：镇站之宝后20集没有声音的问题（V1.1.2）
-- [x] 修复：多任务下载卡顿的问题（V1.1.2）
-- [x] 修复：下载时可能出现多个任务同时下载的问题（V1.1.2）
-- [x] 修复：下载导致的内存泄露问题（V1.1.2）
-- [x] 优化：登陆用户名不再限制为邮箱（V1.1.2）
-- [x] 优化：按顺序下载（V1.1.2）
-- [x] 新增：修改个人信息（V1.1.2）
-- [x] 新增：修改密码（V1.1.2）
-- [x] 新增：注册（V1.1.2）
-- [x] 新增：忘记密码（V1.1.2）
-- [x] 新增：弹幕屏蔽功能（V1.1.2）
-- [x] 删除：变速播放（V1.1.2）
 - [ ] 修改头像（V1.1.3）
 - [ ] 同步收藏（接口不全）
 - [ ] 发私信（接口不全）

app/src/main/kotlin/me/sweetll/tucao/business/download/adapter/DownloadedVideoAdapter.kt

@@ -15,7 +15,7 @@ import me.sweetll.tucao.business.video.VideoActivity
 import me.sweetll.tucao.extension.formatWithUnit
 import me.sweetll.tucao.extension.load
 
-class DownloadedVideoAdapter(val downloadActivity: DownloadActivity, data: MutableList<MultiItemEntity>?): BaseMultiItemQuickAdapter<MultiItemEntity, BaseViewHolder>(data) {
+class DownloadedVideoAdapter(val downloadActivity: DownloadActivity, data: MutableList<MultiItemEntity>?) : BaseMultiItemQuickAdapter<MultiItemEntity, BaseViewHolder>(data) {
     companion object {
         const val TYPE_VIDEO = 0
         const val TYPE_PART = 1
@@ -38,8 +38,7 @@ class DownloadedVideoAdapter(val downloadActivity: DownloadActivity, data: Mutab
                 helper.setVisible(R.id.checkbox, video.checkable)
                 val checkBox = helper.getView<CheckBox>(R.id.checkbox)
                 checkBox.isChecked = video.checked
-                checkBox.setOnCheckedChangeListener {
-                    _, checked ->
+                checkBox.setOnCheckedChangeListener { _, checked ->
                     video.checked = checked
                     updateMenu()
                 }
@@ -56,7 +55,7 @@ class DownloadedVideoAdapter(val downloadActivity: DownloadActivity, data: Mutab
                         updateMenu()
                     } else {
                         if (video.singlePart) {
-                            CachedVideoActivity.intentTo(mContext, video.parts[0])
+                            CachedVideoActivity.intentTo(mContext, video)
                         } else {
                             if (video.isExpanded) {
                                 collapse(helper.adapterPosition)
@@ -78,19 +77,18 @@ class DownloadedVideoAdapter(val downloadActivity: DownloadActivity, data: Mutab
                 helper.setVisible(R.id.checkbox, part.checkable)
                 val checkBox = helper.getView<CheckBox>(R.id.checkbox)
                 checkBox.isChecked = part.checked
-                checkBox.setOnCheckedChangeListener {
-                    _, checked ->
+                checkBox.setOnCheckedChangeListener { _, checked ->
                     part.checked = checked
                     updateMenu()
                 }
 
                 helper.itemView.setOnClickListener {
+                    val parentVideo = data.find { video ->
+                        (video as Video).parts.any { it.vid == part.vid }
+                    } as Video
                     if (part.checkable) {
                         checkBox.isChecked = !checkBox.isChecked
-                        val parentVideo = data.find {
-                            video ->
-                            (video as Video).parts.any { it.vid == part.vid }
-                        } as Video
+
                         val currentPosition = parentVideo.parts.indexOf(part)
                         val newParentChecked = parentVideo.parts.all(Part::checked)
                         if (newParentChecked != parentVideo.checked) {
@@ -99,7 +97,7 @@ class DownloadedVideoAdapter(val downloadActivity: DownloadActivity, data: Mutab
                         }
                         updateMenu()
                     } else {
-                        CachedVideoActivity.intentTo(mContext, part)
+                        CachedVideoActivity.intentTo(mContext, parentVideo.apply { parts = mutableListOf(parts.find { it.vid == part.vid }!! ) })
                     }
                 }
             }

app/src/main/kotlin/me/sweetll/tucao/business/video/CachedVideoActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.View
 import android.view.WindowManager
 import com.shuyu.gsyvideoplayer.GSYPreViewManager
@@ -19,11 +20,14 @@ import me.sweetll.tucao.base.BaseActivity
 import me.sweetll.tucao.model.json.Part
 import me.sweetll.tucao.business.video.adapter.StandardVideoAllCallBackAdapter
 import me.sweetll.tucao.databinding.ActivityCachedVideoBinding
+import me.sweetll.tucao.extension.HistoryHelpers
 import me.sweetll.tucao.extension.setUp
 import me.sweetll.tucao.extension.toast
+import me.sweetll.tucao.model.json.Video
 import me.sweetll.tucao.widget.DanmuVideoPlayer
 import tv.danmaku.ijk.media.player.IjkMediaPlayer
 import java.io.File
+import java.util.*
 
 class CachedVideoActivity : BaseActivity(), DanmuVideoPlayer.DanmuPlayerHolder {
     lateinit var binding: ActivityCachedVideoBinding
@@ -33,12 +37,17 @@ class CachedVideoActivity : BaseActivity(), DanmuVideoPlayer.DanmuPlayerHolder {
     var isPlay = false
     var isPause = false
 
+    var firstPlay = true
+
+    lateinit var video: Video
+    lateinit var selectedPart: Part
+
     companion object {
-        private val ARG_PART = "part"
+        private val ARG_VIDEO = "video"
 
-        fun intentTo(context: Context, part: Part) {
+        fun intentTo(context: Context, video: Video) {
             val intent = Intent(context, CachedVideoActivity::class.java)
-            intent.putExtra(ARG_PART, part)
+            intent.putExtra(ARG_VIDEO, video)
             context.startActivity(intent)
         }
     }
@@ -47,11 +56,22 @@ class CachedVideoActivity : BaseActivity(), DanmuVideoPlayer.DanmuPlayerHolder {
         window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
 
         binding = DataBindingUtil.setContentView(this, R.layout.activity_cached_video)
-        val part: Part = intent.getParcelableExtra(ARG_PART)
+        video = intent.getParcelableExtra(ARG_VIDEO)
+        selectedPart = video.parts[0]
+
+        HistoryHelpers.loadPlayHistory()
+                .flatMap { it.parts }
+                .find { it.vid == selectedPart.vid }
+                ?.let {
+                    selectedPart.hadPlay = true
+                    selectedPart.lastPlayPosition = it.lastPlayPosition
+                }
+
+
         setupPlayer()
-        loadPart(part)
+        loadPart(selectedPart)
 
-        val danmuFile = File(part.durls[0].cacheFolderPath, "danmu.xml")
+        val danmuFile = File(selectedPart.durls[0].cacheFolderPath, "danmu.xml")
         if (danmuFile.exists()) {
             loadDanmuUri(danmuFile.absolutePath)
         } else {
@@ -88,7 +108,14 @@ class CachedVideoActivity : BaseActivity(), DanmuVideoPlayer.DanmuPlayerHolder {
             override fun onPrepared(url: String?) {
                 super.onPrepared(url)
                 isPlay = true
+                if (firstPlay) {
+                    firstPlay = false
+                    if (selectedPart.lastPlayPosition != 0) {
+                        binding.player.showJump(selectedPart.lastPlayPosition)
+                    }
+                }
             }
+
         })
 
         binding.player.fullscreenButton.visibility = View.GONE
@@ -119,7 +146,7 @@ class CachedVideoActivity : BaseActivity(), DanmuVideoPlayer.DanmuPlayerHolder {
 
     override fun onPause() {
         super.onPause()
-        binding.player.onVideoPause()
+        binding.player.onVideoPause(isPlay)
         isPause = true
     }
 
@@ -141,6 +168,16 @@ class CachedVideoActivity : BaseActivity(), DanmuVideoPlayer.DanmuPlayerHolder {
     }
 
     override fun onSavePlayHistory(position: Int) {
-        // DO nothing
+        HistoryHelpers.savePlayHistory(
+        video.copy(create = DateFormat.format("yyyy-MM-dd hh:mm:ss", Date()).toString())
+                .also {
+                    it.parts = video.parts.filter {
+                        it.vid == selectedPart.vid
+                    }.map {
+                        it.lastPlayPosition = position
+                        it
+                    }.toMutableList()
+                }
+        )
     }
 }

app/src/main/kotlin/me/sweetll/tucao/widget/DanmuVideoPlayer.kt

@@ -144,7 +144,7 @@ class DanmuVideoPlayer : PreviewGSYVideoPlayer {
 
     fun hideSetting() {
             settingLayout.animate()
-                .translationX((250f).dp2px())
+                .translationX((280f).dp2px())
                 .setDuration(200)
                 .setListener(object : AnimatorListenerAdapter() {
                     override fun onAnimationEnd(animation: Animator?) {

changelog.md

@@ -8,6 +8,7 @@
 - 修复：下载导致的内存泄露问题
 - 优化：登陆用户名不再限制为邮箱
 - 优化：按顺序下载
+- 优化：离线视频记录播放位置
 - 新增：修改个人信息
 - 新增：修改密码
 - 新增：注册