Merge pull request #210 from misaka10032w/develop

misaka10032w · web-flow · commit 47abe9f788ba · 2025-10-30T19:01:45.000+08:00
[Add] 搜索结果页增加已播放状态标记功能，可在设置中关闭
diff --git a/app/src/main/java/com/yenaly/han1meviewer/Preferences.kt b/app/src/main/java/com/yenaly/han1meviewer/Preferences.kt
@@ -132,6 +132,9 @@ object Preferences {
     val videoQuality: String
         get() = preferenceSp.getString(HomeSettingsFragment.DEFAULT_VIDEO_QUALITY, "1080P") ?: "1080P"
 
+    val showPlayedIndicator: Boolean
+        get() = preferenceSp.getBoolean(HomeSettingsFragment.SHOW_PLAYED_INDICATOR,true)
+
     val fakeLauncherIcon: String
         get() = preferenceSp.getString(
             HomeSettingsFragment.FAKE_LAUNCHER_ICON,
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/DatabaseRepo.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/DatabaseRepo.kt
@@ -202,6 +202,9 @@ object DatabaseRepo {
 
         suspend fun findBy(videoCode: String) =
             watchHistoryDao.findBy(videoCode)
+
+        suspend fun getWatched(resultList: List<String>) =
+            watchHistoryDao.getWatchedCodes(resultList)
     }
 
     object HanimeDownload {
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/dao/WatchHistoryDao.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/dao/WatchHistoryDao.kt
@@ -30,6 +30,9 @@ abstract class WatchHistoryDao {
     @Query("SELECT * FROM WatchHistoryEntity WHERE (`videoCode` = :videoCode) LIMIT 1")
     abstract suspend fun findBy(videoCode: String): WatchHistoryEntity?
 
+    @Query("SELECT videoCode FROM WatchHistoryEntity WHERE videoCode IN (:codes)")
+    abstract suspend fun getWatchedCodes(codes: List<String>): List<String>
+
     @Query("UPDATE WatchHistoryEntity SET progress = :progress WHERE videoCode = :videoCode")
     abstract suspend fun updateProgress(videoCode: String, progress: Long)
 
diff --git a/app/src/main/java/com/yenaly/han1meviewer/logic/model/HanimeInfo.kt b/app/src/main/java/com/yenaly/han1meviewer/logic/model/HanimeInfo.kt
@@ -26,6 +26,7 @@ data class HanimeInfo(
     override var itemType: Int,
     override val reviews: String? = "",
     override val currentArtist: String? = "",
+    val watched: Boolean ?= false,
 ): VideoItemType , HanimeInfoType {
     companion object {
         const val NORMAL = 0
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeVideoRvAdapter.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/adapter/HanimeVideoRvAdapter.kt
@@ -14,6 +14,7 @@ import coil.load
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.itxca.spannablex.spannable
+import com.yenaly.han1meviewer.Preferences
 import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.VIDEO_LAYOUT_MATCH_PARENT
 import com.yenaly.han1meviewer.VIDEO_LAYOUT_WRAP_CONTENT
@@ -76,6 +77,8 @@ class HanimeVideoRvAdapter(
                     crossfade(true)
                 }
                 holder.getView<TextView>(R.id.title).text = item.title
+                if (Preferences.showPlayedIndicator)
+                    holder.getView<ImageView>(R.id.watched_icon).isVisible = item.watched == true
             }
 
             HanimeInfo.NORMAL -> {
@@ -121,6 +124,8 @@ class HanimeVideoRvAdapter(
                         item.artist.text()
                     }
                 }
+                if (Preferences.showPlayedIndicator)
+                    holder.getView<ImageView>(R.id.watched_icon).isVisible = item.watched == true
             }
         }
     }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/settings/HomeSettingsFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/settings/HomeSettingsFragment.kt
@@ -81,7 +81,7 @@ class HomeSettingsFragment : YenalySettingsFragment(R.xml.settings_home) {
     companion object {
         const val VIDEO_LANGUAGE = "video_language"
         const val DEFAULT_VIDEO_QUALITY = "default_video_quality"
-
+        const val SHOW_PLAYED_INDICATOR = "show_played_indicator"
         const val ALLOW_PIP_MDOE = "allow_pip_mode"
         const val PLAYER_SETTINGS = "player_settings"
         const val H_KEYFRAME_SETTINGS = "h_keyframe_settings"
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/SearchViewModel.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/viewmodel/SearchViewModel.kt
@@ -26,6 +26,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 /**
  * @project Hanime1
@@ -121,7 +122,18 @@ class SearchViewModel(
                 if (prev is PageLoadingState.Loading) _searchFlow.value = emptyList()
                 _searchFlow.update { prevList ->
                     when (state) {
-                        is PageLoadingState.Success -> prevList + state.info
+//                        is PageLoadingState.Success -> prevList + state.info
+                        is PageLoadingState.Success -> {
+                            val list = state.info
+                            val codes = list.map { it.videoCode }
+                            val watchedCodes= withContext(Dispatchers.IO) {
+                                DatabaseRepo.WatchHistory.getWatched(codes).toSet()
+                            }
+                            val updatedList = list.map { item ->
+                                item.copy(watched = watchedCodes.contains(item.videoCode))
+                            }
+                            prevList + updatedList
+                        }
                         is PageLoadingState.Loading -> emptyList()
                         else -> prevList
                     }
diff --git a/app/src/main/res/drawable/icon_circle_bg.xml b/app/src/main/res/drawable/icon_circle_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/colorSurfaceVariant"/>
+</shape>
diff --git a/app/src/main/res/layout/item_hanime_video.xml b/app/src/main/res/layout/item_hanime_video.xml
@@ -55,6 +55,17 @@
                         android:gravity="center"
                         android:text="@string/now_playing"
                         android:textColor="?attr/colorSurface" />
+                    <ImageView
+                        android:id="@+id/watched_icon"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="top|end"
+                        android:layout_margin="6dp"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_baseline_check_circle_24"
+                        android:background="@drawable/icon_circle_bg"
+                        android:visibility="gone"
+                        tools:visibility="visible"/>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_hanime_video_simplified.xml b/app/src/main/res/layout/item_hanime_video_simplified.xml
@@ -43,6 +43,17 @@
                         android:contentDescription="@null"
                         app:shapeAppearanceOverlay="@style/TopRoundCornerImageView" />
 
+                    <ImageView
+                        android:id="@+id/watched_icon"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="top|end"
+                        android:layout_margin="6dp"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_baseline_check_circle_24"
+                        android:background="@drawable/icon_circle_bg"
+                        android:visibility="gone"
+                        tools:visibility="visible"/>
                 </FrameLayout>
 
                 <TextView
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -481,4 +481,6 @@ Recommendations are as follows:\n
     <string name="complete_cloudflare_verification_with_warning">Please complete Cloudflare verification and wait for the page to close automatically.\n Outdated WebView component may cause verification failure or loop verification! If verification fails, please upgrade WebView or go to Settings->Network Settings->Domain to switch to alternative domains (other domains may have lower risk control restrictions).</string>
     <string name="search_artist_ignore_video_type">Search Artist Ignore Video Type</string>
     <string name="search_artist_ignore_video_type_summary">When enabled, clicking avatar on details page to search artist will not include video type.</string>
+    <string name="show_played_indicator">Show Played Status Indicator</string>
+    <string name="show_played_indicator_summary">When enabled, shows played indicator at top-right corner of video covers on search results page</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -486,4 +486,6 @@ hanime1.me以外のドメインは、特定の時間帯にhanime1.meにリダイ
     <string name="complete_cloudflare_verification_with_warning">Cloudflare認証を完了し、ページが自動的に閉じるのを待ってください。\n WebViewコンポーネントのバージョンが古いと認証失敗やループ認証が発生する可能性があります！認証に失敗した場合は、WebViewをアップグレードするか、設定→ネットワーク設定→ドメインで代替ドメインに切り替えてください（他のドメインはリスク制限が低い場合があります）。</string>
     <string name="search_artist_ignore_video_type">アーティスト検索で動画タイプを無視</string>
     <string name="search_artist_ignore_video_type_summary">有効にすると、詳細ページのアバターをクリックしてアーティストを検索する際、動画タイプが含まれなくなります。</string>
+    <string name="show_played_indicator">再生状態マークを表示</string>
+    <string name="show_played_indicator_summary">有効にすると、検索結果ページの動画カバー右上に再生済みマークが表示されます</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -486,4 +486,6 @@
     <string name="complete_cloudflare_verification_with_warning">请完成 Cloudflare 验证，并等待页面主动关闭。\n WebView组件版本过低可能会验证失败，如循环验证！如验证失败，请升级WebView或到 设置->网络设置->域名 更换其他备选域名（其他域名可能风控程度较低）。</string>
     <string name="search_artist_ignore_video_type">搜索艺术家忽略影片类型</string>
     <string name="search_artist_ignore_video_type_summary">开启后，点击详情页头像搜索艺术家时，不再附带影片类型。</string>
+    <string name="show_played_indicator">显示播放状态标记</string>
+    <string name="show_played_indicator_summary">开启后将在搜索结果页视频封面右上角显示已播放标记</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -516,4 +516,6 @@
     <string name="complete_cloudflare_verification_with_warning">請完成 Cloudflare 驗證，並等待頁面主動關閉。\n WebView元件版本過低可能會驗證失敗，如循環驗證！如驗證失敗，請升級WebView或到 設定->網路設定->網域 更換其他備選網域（其他網域可能風控程度較低）。</string>
     <string name="search_artist_ignore_video_type">搜尋藝術家忽略影片類型</string>
     <string name="search_artist_ignore_video_type_summary">開啟後，點選詳細頁頭像搜尋藝術家時，不再附帶影片類型。</string>
+    <string name="show_played_indicator">顯示播放狀態標記</string>
+    <string name="show_played_indicator_summary">開啟後將在搜尋結果頁影片封面右上角顯示已播放標記</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_home.xml b/app/src/main/res/xml/settings_home.xml
@@ -26,6 +26,12 @@
             app:key="allow_resume_playback"
             app:summary="@string/resume_playback_summary"
             app:title="@string/resume_playback_title" />
+        <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
+            app:defaultValue="true"
+            app:icon="@drawable/ic_baseline_history_24"
+            app:key="show_played_indicator"
+            app:summary="@string/show_played_indicator_summary"
+            app:title="@string/show_played_indicator" />
         <com.yenaly.yenaly_libs.base.preference.MaterialSwitchPreference
             app:defaultValue="false"
             app:icon="@drawable/baseline_prohibit_24"

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,9 @@ object DatabaseRepo {`
`202`	`202`
`203`	`203`	`suspend fun findBy(videoCode: String) =`
`204`	`204`	`watchHistoryDao.findBy(videoCode)`
	`205`	`+`
	`206`	`+ suspend fun getWatched(resultList: List<String>) =`
	`207`	`+ watchHistoryDao.getWatchedCodes(resultList)`
`205`	`208`	`}`
`206`	`209`
`207`	`210`	`object HanimeDownload {`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import coil.load`
`14`	`14`	`import com.chad.library.adapter4.BaseQuickAdapter`
`15`	`15`	`import com.chad.library.adapter4.viewholder.QuickViewHolder`
`16`	`16`	`import com.itxca.spannablex.spannable`
	`17`	`+import com.yenaly.han1meviewer.Preferences`
`17`	`18`	`import com.yenaly.han1meviewer.R`
`18`	`19`	`import com.yenaly.han1meviewer.VIDEO_LAYOUT_MATCH_PARENT`
`19`	`20`	`import com.yenaly.han1meviewer.VIDEO_LAYOUT_WRAP_CONTENT`
`@@ -76,6 +77,8 @@ class HanimeVideoRvAdapter(`
`76`	`77`	`crossfade(true)`
`77`	`78`	`}`
`78`	`79`	`holder.getView<TextView>(R.id.title).text = item.title`
	`80`	`+ if (Preferences.showPlayedIndicator)`
	`81`	`+ holder.getView<ImageView>(R.id.watched_icon).isVisible = item.watched == true`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`HanimeInfo.NORMAL -> {`
`@@ -121,6 +124,8 @@ class HanimeVideoRvAdapter(`
`121`	`124`	`item.artist.text()`
`122`	`125`	`}`
`123`	`126`	`}`
	`127`	`+ if (Preferences.showPlayedIndicator)`
	`128`	`+ holder.getView<ImageView>(R.id.watched_icon).isVisible = item.watched == true`
`124`	`129`	`}`
`125`	`130`	`}`
`126`	`131`	`}`