Skip to content

Commit aa7240c

Browse files
committed
fix: 修复 HomeHeroCarousel 和 CollectionDetailScreen 编译错误
同时为 server-ci、release-contract、android-device-smoke 的 push 分支增加 path 过滤,避免推送 android 代码时触发不必要的 workflow
1 parent 89f2aaa commit aa7240c

6 files changed

Lines changed: 37 additions & 5 deletions

File tree

‎.claude/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"permissions": {
33
"allow": [
44
"Bash(git add *)",
5-
"Bash(git commit -m '修复安卓端剧集详情页 404 问题:区分 series/media 类型路由 *)"
5+
"Bash(git commit -m '修复安卓端剧集详情页 404 问题:区分 series/media 类型路由 *)",
6+
"Bash(git push *)"
67
]
78
}
89
}

‎.github/workflows/android-device-smoke.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
push:
1010
branches: [main]
1111
paths:
12-
- 'android/**'
1312
- 'scripts/android-device-smoke.sh'
1413
- '.github/workflows/android-device-smoke.yml'
1514
workflow_dispatch:

‎.github/workflows/release-contract.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ name: Release Contract
33
on:
44
push:
55
branches: [main, refactor/server-lite-v1]
6+
paths:
7+
- 'scripts/release.sh'
8+
- 'scripts/release-advanced.sh'
9+
- 'scripts/dockerhub-auth-preflight.mjs'
10+
- 'scripts/generate-release-notes.mjs'
11+
- 'scripts/fpk/**'
12+
- '.gitignore'
13+
- '.github/workflows/release-contract.yml'
614
pull_request:
715
paths:
816
- 'scripts/release.sh'

‎.github/workflows/server-ci.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,30 @@ on:
55
branches:
66
- main
77
- refactor/server-lite-v1
8+
paths:
9+
- 'cmd/server-lite/**'
10+
- 'cmd/server/**'
11+
- 'cmd/transcode-fixture-cert/**'
12+
- 'internal/playback/**'
13+
- 'internal/service/lite.go'
14+
- 'internal/service/task_center.go'
15+
- 'internal/service/task_center_test.go'
16+
- 'internal/service/playback_planner.go'
17+
- 'internal/service/playback_planner_test.go'
18+
- 'internal/service/playback_startup*.go'
19+
- 'internal/service/media_probe_warmup*.go'
20+
- 'internal/service/transcode*.go'
21+
- 'internal/service/stream_artifacts.go'
22+
- 'internal/service/ondemand.go'
23+
- 'internal/service/media_analysis_worker*.go'
24+
- 'internal/handler/lite.go'
25+
- 'internal/handler/handler.go'
26+
- 'internal/handler/stream_artifacts.go'
27+
- 'internal/handler/stream_startup_bridge.go'
28+
- 'internal/handler/task_center.go'
29+
- 'internal/handler/playback_plan.go'
30+
- 'go.mod'
31+
- 'go.sum'
832
pull_request:
933
paths:
1034
- 'cmd/server-lite/**'

‎android/feature/main/src/main/java/com/nowen/video/v2/feature/main/HomeScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ fun HomeScreen(
287287
private fun HomeHeroCarousel(
288288
items: List<MediaCard>,
289289
baseUrl: String?,
290-
onOpen: (String) -> Unit,
290+
onOpen: (String, Boolean) -> Unit,
291291
onPlay: (String) -> Unit,
292292
onRestart: (String) -> Unit,
293293
onFavoritesClick: () -> Unit,
@@ -484,7 +484,7 @@ private fun HomeHeroCarousel(
484484
}
485485

486486
Surface(
487-
onClick = { onOpen(item.resolvedId) },
487+
onClick = { onOpen(item.resolvedId, item.isSeries) },
488488
modifier = Modifier
489489
.align(Alignment.TopEnd)
490490
.padding(12.dp),

‎android/feature/main/src/main/java/com/nowen/video/v2/feature/main/SocialCatalogScreens.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ fun CollectionDetailScreen(
449449
media.rating.takeIf { it > 0 }?.let { "★ %.1f".format(it) },
450450
media.resolution.takeIf(String::isNotBlank),
451451
).joinToString(" · "),
452-
onClick = { onMediaClick(media.id, media.isSeries) },
452+
onClick = { onMediaClick(media.id, media.mediaType == "series") },
453453
)
454454
}
455455
}

0 commit comments

Comments
 (0)