refactor(compose): P2 hardening for compose lib

CarGuo · CarGuo · commit 16670e96da6f · 2026-05-18T15:53:12.000+08:00
P2-1 Narrow GSYComposeHostPlayer API surface
  - class and 3 constructors switched from public to package-private:
    only GSYPlayerController / GSYPlayerSurface inside
    com.shuyu.gsyvideoplayer.compose.native_ may use it.
  - Drop the redundant getCurrentStatePublic() bridge: the parent
    GSYVideoView already exposes public getCurrentState(). Controller
    now reads player.currentState directly.

P2-2 Fix GSYPlayerSurface side-effect anti-pattern
  - rememberGSYPlayerController used remember(...) { setUp(); url } as
    its calculation lambda, mixing 'state computation' with a real I/O
    side-effect that may fire on each recomposition.
  - Replaced with LaunchedEffect(controller, url, ...) so it runs once
    per key change, on a Main-bound coroutine, with proper cancellation
    on dispose / key change.

P2-3 Fix GSYDefaultControls slider seek storm
  - Old impl called controller.seekTo(...) on every onValueChange tick
    while dragging, which thrashed the player and caused stutter.
  - New impl keeps a local 'dragging: Float?' preview state:
    onValueChange only updates preview, onValueChangeFinished commits
    seekTo once. Time label and slider thumb both follow the preview
    while dragging, then snap back to the real position on release.

P2-4 Drop dead config composeCompilerVersion
  - Removed `composeCompilerVersion = "1.5.14"` from
    gradle/dependencies.gradle. Since Kotlin 2.0+, compose-compiler is
    bundled with Kotlin and driven by the
    org.jetbrains.kotlin.plugin.compose Gradle plugin (already applied
    in gsyVideoPlayer-compose/build.gradle), so the property was unused
    and could mislead future maintainers.

P2-5 Fix consumerProguardFiles dangling reference
  - gradle/lib.gradle declares consumerProguardFiles "consumer-rules.pro"
    but the file did not exist for the compose module, causing a
    silent skip of mergeReleaseConsumerProguardFiles and a 'Missing
    consumer ProGuard file' warning for downstream R8/Proguard users.
  - Added an empty (commented-only) consumer-rules.pro for the compose
    module. Verified mergeReleaseConsumerProguardFiles now runs.

Verified locally:
  - GetDiagnostics: 0 issues
  - ./gradlew :gsyVideoPlayer-compose:assembleRelease :app:assembleDebug
    BUILD SUCCESSFUL
  - publishToMavenLocal default channel BUILD SUCCESSFUL
    -&gt; ~/.m2/.../com/shuyu/gsyvideoplayer-compose/13.0.0/
  - publishToMavenLocal -PPUBLISH_TARGET=mavenCentral BUILD SUCCESSFUL
    -&gt; ~/.m2/.../io/github/carguo/gsyvideoplayer-compose/13.0.0/
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -6,7 +6,8 @@ ext {
     permissionsDispatcherVersion = "4.9.1"
     // Kotlin & Compose（仅 gsyVideoPlayer-compose 模块使用）
     kotlinVersion = "2.0.21"
-    composeCompilerVersion = "1.5.14"
+    // 注意：Compose Compiler 版本由 `org.jetbrains.kotlin.plugin.compose` 跟随 kotlinVersion 自动管理，
+    // 不再需要单独配置 composeCompilerVersion（Kotlin 2.0+ 之后 compose compiler 已并入 Kotlin 仓库）。
     composeBomVersion = "2024.06.00"
     activityComposeVersion = "1.9.0"
     lifecycleComposeVersion = "2.8.2"
diff --git a/gsyVideoPlayer-compose/consumer-rules.pro b/gsyVideoPlayer-compose/consumer-rules.pro
@@ -0,0 +1,8 @@
+# Consumer ProGuard rules for gsyvideoplayer-compose.
+#
+# Compose 库自身不需要额外保留规则：
+#   - androidx.compose.* 由 Google 官方 Compose 库随依赖自带 consumer rules；
+#   - 本模块只是在 Compose 之上的薄包装，没有反射 / Native 调用 / Service / 序列化点。
+#
+# 该文件存在的目的，是满足上层 lib.gradle 中 `consumerProguardFiles "consumer-rules.pro"`
+# 的引用，避免下游依赖方在打开 R8/Proguard 时出现 "Missing consumer ProGuard file" 警告。
diff --git a/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYComposeHostPlayer.java b/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYComposeHostPlayer.java
@@ -12,20 +12,23 @@
  * Compose 原生模式底层承载 Player：
  * 复用 StandardGSYVideoPlayer 的内核与渲染管线，但隐藏所有自带 UI，
  * 由 Compose 端自行绘制控制条与浮层。
+ *
+ * 包私有：仅在 com.shuyu.gsyvideoplayer.compose.native_ 内使用，
+ * 通过 {@link GSYPlayerController} / {@link GSYPlayerSurface} 暴露给上层。
  */
-public class GSYComposeHostPlayer extends StandardGSYVideoPlayer {
+class GSYComposeHostPlayer extends StandardGSYVideoPlayer {
 
-    public GSYComposeHostPlayer(Context context, Boolean fullFlag) {
+    GSYComposeHostPlayer(Context context, Boolean fullFlag) {
         super(context, fullFlag);
         hideSelfWidgets();
     }
 
-    public GSYComposeHostPlayer(Context context) {
+    GSYComposeHostPlayer(Context context) {
         super(context);
         hideSelfWidgets();
     }
 
-    public GSYComposeHostPlayer(Context context, AttributeSet attrs) {
+    GSYComposeHostPlayer(Context context, AttributeSet attrs) {
         super(context, attrs);
         hideSelfWidgets();
     }
@@ -103,9 +106,4 @@ protected void touchSurfaceMoveFullLogic(float absDeltaX, float absDeltaY) {
 
     @Override
     protected void touchDoubleUp(MotionEvent e) { /* 不响应双击 */ }
-
-    /** 暴露给 Compose 层使用 */
-    public int getCurrentStatePublic() {
-        return mCurrentState;
-    }
 }
diff --git a/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYDefaultControls.kt b/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYDefaultControls.kt
@@ -19,6 +19,9 @@ import androidx.compose.material3.Slider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -59,6 +62,10 @@ fun GSYDefaultControls(
 ) {
     val snap by controller.snapshot
 
+    // 拖拽中本地预览：dragging != null 时 UI 跟随手指，但不真正 seek；
+    // 抬手（onValueChangeFinished）才一次性提交 seekTo，避免每帧 seek 卡顿。
+    var dragging by remember { mutableStateOf<Float?>(null) }
+
     Box(modifier) {
         // 中央按钮 / loading
         Box(Modifier.matchParentSize(), contentAlignment = Alignment.Center) {
@@ -107,15 +114,17 @@ fun GSYDefaultControls(
                     tint = Color.White,
                 )
             }
-            Text(formatTime(snap.currentPosition), color = Color.White)
+            Text(formatTime(displayPositionMs(snap.currentPosition, snap.duration, dragging)), color = Color.White)
             Box(modifier = Modifier.weight(1f).padding(horizontal = 8.dp)) {
                 val durationMs: Long = snap.duration.coerceAtLeast(0L)
-                val progress: Float = if (durationMs > 0L) {
+                val livedProgress: Float = if (durationMs > 0L) {
                     // 用 Double 计算，避免 Long 很大时 Float 精度丢失
                     (snap.currentPosition.toDouble() / durationMs.toDouble())
                         .toFloat()
                         .coerceIn(0f, 1f)
                 } else 0f
+                // 拖拽中以本地预览覆盖，松开后回到真实播放进度
+                val progress: Float = dragging ?: livedProgress
                 val bufferProgress: Float = (snap.bufferPercent / 100f).coerceIn(0f, 1f)
 
                 // 缓冲进度条放在 Slider 之下作为背景，避免遮挡 Slider 的拖拽手势
@@ -131,8 +140,14 @@ fun GSYDefaultControls(
                 Slider(
                     value = progress,
                     onValueChange = { v ->
-                        if (durationMs > 0L) {
-                            // Long * Double 防溢出；先 clamp 比例再换算
+                        // 拖拽期间：仅更新本地预览状态，不调用 seekTo
+                        dragging = v.coerceIn(0f, 1f)
+                    },
+                    onValueChangeFinished = {
+                        // 抬手：一次性提交 seek，并清除预览覆盖（让回写的真实进度接管）
+                        val v = dragging
+                        dragging = null
+                        if (v != null && durationMs > 0L) {
                             val ratio = v.coerceIn(0f, 1f).toDouble()
                             val target = (ratio * durationMs).toLong().coerceIn(0L, durationMs)
                             controller.seekTo(target)
@@ -155,3 +170,14 @@ private fun formatTime(ms: Long): String {
     return if (h > 0) String.format(Locale.US, "%d:%02d:%02d", h, m, s)
     else String.format(Locale.US, "%02d:%02d", m, s)
 }
+
+/**
+ * 拖拽中：以本地预览比例 dragging * duration 显示；非拖拽：使用真实 currentPosition。
+ */
+private fun displayPositionMs(currentPosition: Long, duration: Long, dragging: Float?): Long {
+    if (dragging == null) return currentPosition
+    val safeDuration = duration.coerceAtLeast(0L)
+    if (safeDuration <= 0L) return 0L
+    val ratio = dragging.coerceIn(0f, 1f).toDouble()
+    return (ratio * safeDuration).toLong().coerceIn(0L, safeDuration)
+}
diff --git a/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYPlayerController.kt b/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYPlayerController.kt
@@ -158,7 +158,7 @@ class GSYPlayerController internal constructor(
     }
 
     private fun syncFromHost(player: GSYComposeHostPlayer) {
-        val state = when (player.currentStatePublic) {
+        val state = when (player.currentState) {
             GSYVideoView.CURRENT_STATE_NORMAL -> GSYPlayState.Idle
             GSYVideoView.CURRENT_STATE_PREPAREING -> GSYPlayState.Preparing
             GSYVideoView.CURRENT_STATE_PLAYING -> GSYPlayState.Playing
@@ -190,7 +190,7 @@ class GSYPlayerController internal constructor(
 
     fun togglePlayPause() {
         val p = host ?: return
-        when (p.currentStatePublic) {
+        when (p.currentState) {
             GSYVideoView.CURRENT_STATE_PLAYING -> p.onVideoPause()
             GSYVideoView.CURRENT_STATE_PAUSE -> p.onVideoResume()
             GSYVideoView.CURRENT_STATE_AUTO_COMPLETE -> p.startPlayLogic()
diff --git a/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYPlayerSurface.kt b/gsyVideoPlayer-compose/src/main/java/com/shuyu/gsyvideoplayer/compose/native_/GSYPlayerSurface.kt
@@ -2,6 +2,7 @@ package com.shuyu.gsyvideoplayer.compose.native_
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
@@ -24,9 +25,14 @@ fun rememberGSYPlayerController(
     val context = LocalContext.current
     val controller = remember { GSYPlayerController(context) }
     if (url != null) {
-        remember(controller, url, cacheWithPlay, title, autoPlay) {
+        // 关键约束：不能在 remember 的 calculation lambda 里执行 controller.setUp(...)，
+        // 那是把"副作用"放在了"读 state"的位置——重组期会被多次调用，
+        // 也无法保证只在 key 变化时触发一次。改用 LaunchedEffect：
+        //   - key 变化时取消上一次协程并重新执行
+        //   - 离开 composition 时自动清理
+        //   - 在主线程的协程作用域内执行，避免 race
+        LaunchedEffect(controller, url, cacheWithPlay, title, autoPlay) {
             controller.setUp(url, cacheWithPlay, title, autoPlay)
-            url
         }
     }
     DisposableEffect(controller) {
