From 2782d413cb05109de33713dae71a157562ec638b Mon Sep 17 00:00:00 2001
From: xiaji <xiaji@example.com>
Date: Thu, 28 May 2026 18:03:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=88=B03=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BB=AD=E6=92=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/videoapp/tv/PlayerActivity.kt   | 7 +++++++
 app/src/main/java/com/videoapp/tv/data/AppDatabase.kt | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/videoapp/tv/PlayerActivity.kt b/app/src/main/java/com/videoapp/tv/PlayerActivity.kt
index 3808166..bb4113c 100644
--- a/app/src/main/java/com/videoapp/tv/PlayerActivity.kt
+++ b/app/src/main/java/com/videoapp/tv/PlayerActivity.kt
@@ -184,6 +184,12 @@ class PlayerActivity : AppCompatActivity() {
 
         if (historyEpisode != null) {
             scrollToEpisode(historyEpisode!!)
+            if (resumePosition != null && resumePosition!! > 0) {
+                val target = source.episodes.find { it.title == historyEpisode }
+                if (target != null) {
+                    playEpisode(target)
+                }
+            }
         } else {
             if (source.episodes.isNotEmpty()) {
                 playEpisode(source.episodes.first())
@@ -205,6 +211,7 @@ class PlayerActivity : AppCompatActivity() {
                 isFocusableInTouchMode = true
                 setOnClickListener {
                     highlightEpisode(it)
+                    resumePosition = null
                     playEpisode(ep)
                     resetAutoHide()
                 }
diff --git a/app/src/main/java/com/videoapp/tv/data/AppDatabase.kt b/app/src/main/java/com/videoapp/tv/data/AppDatabase.kt
index 2ecce7c..865b39e 100644
--- a/app/src/main/java/com/videoapp/tv/data/AppDatabase.kt
+++ b/app/src/main/java/com/videoapp/tv/data/AppDatabase.kt
@@ -5,7 +5,7 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 
-@Database(entities = [SearchHistory::class, PlayHistory::class], version = 2, exportSchema = false)
+@Database(entities = [SearchHistory::class, PlayHistory::class], version = 3, exportSchema = false)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun searchHistoryDao(): SearchHistoryDao
     abstract fun playHistoryDao(): PlayHistoryDao