Skip to content

Dev - #64

Merged
YaChengMu merged 39 commits into
mainfrom
dev
Sep 10, 2026
Merged

Dev#64
YaChengMu merged 39 commits into
mainfrom
dev

Conversation

@YaChengMu

Copy link
Copy Markdown
Owner

No description provided.

Silent1566 and others added 30 commits September 7, 2026 17:37
Verification: :app:testLeanbackArm64_v8aDebugUnitTest --tests com.fongmi.android.tv.ui.activity.VodActivityCategoryEdgeTest passed; leanback Java compilation passed

Task-Guard: vod-category-edge-switch-20260907
…ne VodActivity

Verification: VodActivityCategoryEdgeTest passes after fix for focus restoration on category edge switch.

Task-Guard: vod-category-edge-focus-20260907
Verification: bash ./gradlew :app:testLeanbackArm64_v8aDebugUnitTest --tests com.fongmi.android.tv.ui.activity.VodActivityCategoryEdgeTest :app:compileLeanbackArm64_v8aDebugJavaWithJavac --console=plain (BUILD SUCCESSFUL); git diff --check (passed)

Task-Guard: vod-category-edge-focus-debug-20260907
Verification: HomeCategoryNavigationSourceTest passed; Leanback Arm64 Java compilation passed; git diff --check passed

Task-Guard: home-category-edge-default-vod-focus-20260908
Verification: TV leanback Java compile; EpisodeDetailDialogThemeTest 6 tests passed; git diff --check passed

Task-Guard: tv-episode-detail-photo-focus-20260908
Verification: docs/AD-AUDIO-RULES-V2-design.md: design comparison, external baselines, speech grammar contract, EXO performance safeguards, staged plan, acceptance criteria, rollback path; git diff --check and contract assertions passed

Task-Guard: AD-AUDIO-RULES-V2
Verification: Pure-JVM javac compilation and JUnit 4.13.2 SpeechAdRuleCodecTest/SpeechAdMatcherTest: 34/34 passed; nine reproduced boundary regressions fixed; changed design document validation passed. Playback integration, APK/device and TV performance not claimed.

Task-Guard: AD-AUDIO-RULES-V2
…on for edge switch

Verification: HomeCategoryNavigationSourceTest passed; Leanback Arm64 Java compilation passed; git diff --check passed

Task-Guard: home-category-edge-unified-focus-20260908
Verification: Design-only Phase 2 gate completed: local call-chain review, Sherpa v1.13.4 source/JAR API evidence, thread/timestamp/lifecycle decision packet, Phase 2A/2B scope, TV acceptance thresholds, rollback and recovery anchor; document structural validation and git diff --check passed. No runtime code, dependency, APK or device behavior changed.

Task-Guard: AD-AUDIO-RULES-V2-P2-DESIGN
Verification: compile+testMobile unit tests pass; device focus recovery validated on 192.168.50.3:5559

Task-Guard: tv-colorful-detail-dismiss-focus-20260908
Verification: 定向编译与单测通过::app:compileLeanbackArm64_v8aDebugJavaWithJavac、:app:testMobileArm64_v8aDebugUnitTest(TmdbDetailActivityLayoutTest、TmdbEpisodeAdapterTest,133项通过);TV APK :app:assembleLeanbackArm64_v8aDebug 构建成功;真机 192.168.50.3:5559 安装并实测炫彩详情第3集长按关闭后 UIAutomator 焦点恢复到第3集卡片(CardView [969,353][1404,750],节点文本“3. 救命之恩,以身相许”),触屏切换后遥控左右可继续移动

Task-Guard: tv-colorful-detail-focus-restore-20260908-r2
Verification: origin/beta@74e572173fcc9ab7e274a94b6245b8de90b217c1 合并无冲突;主题34项与TV焦点139项定向测试全部通过(0 failures/0 errors/0 skipped);Mobile/Leanback Java编译通过;git diff --check、无未合并路径、复评通过

Task-Guard: beta-sync-review-dev3-20260908-round4
…VodID@@@CID 直取 History,命中走 VideoActivity.startDirect 续播直通(EXTRA_RESUME_FROM_HISTORY 携带完整历史对象,与「最近观看」同链路);此前只传 key/id 进详情页靠 History.findPlayback 重匹配,isSeasonEligible 季资格检查会把多季 TMDB 剧的历史拒绝掉「继续观看」回到第 1 集
Verification: Phase 2A final targeted JVM: SpeechAdSignalProviderTest(21), AdAudioRuntimeControllerTest(20), SpeechAdRuntimeEndToEndTest(1), RealtimeSubtitleRecognizerTest(5), AdAudioDiagnosticsTest(3): 50 tests, 0 failures/errors; :app:testLeanbackArm64_v8aDebugUnitTest PASS (13s), log /tmp/ad-audio-p2a-handoff-final-tests.log; :app:assembleLeanbackArm64_v8aDebug PASS (10s), log /tmp/ad-audio-p2a-handoff-final-assemble.log; git diff --check and task-document structure PASS; independent owner handoff review reconciled; real TV/model performance and Phase 2B not verified/implemented.

Task-Guard: AD-AUDIO-RULES-V2-P2A
修复 WebHome fm.vod 打开有历史的影片不续播(多季 TMDB 剧回落第 1 集)
Verification: Phase 2B final Leanback arm64 JVM regression: 106 tests, 0 failures, 0 errors, 0 skipped; Gradle BUILD SUCCESSFUL in 10s. Leanback arm64 Debug assemble: BUILD SUCCESSFUL in 47s; APK 188769225 bytes, SHA-256 0fc9c0ca0e315e57fef6c418f6b3e3d8f8a64cb4f4bc9b7890e31f2d9eea6bc4. Logs: /tmp/ad-audio-p2b-final-tests.log and /tmp/ad-audio-p2b-final-assemble.log.

Task-Guard: AD-AUDIO-RULES-V2-P2B
Verification: TV leanback Java compile; EpisodeDetailDialogThemeTest 6 tests passed; git diff --check passed

Task-Guard: tv-episode-detail-photo-focus-20260908
Verification: compile+testMobile unit tests pass; device focus recovery validated on 192.168.50.3:5559

Task-Guard: tv-colorful-detail-dismiss-focus-20260908
Verification: 定向编译与单测通过::app:compileLeanbackArm64_v8aDebugJavaWithJavac、:app:testMobileArm64_v8aDebugUnitTest(TmdbDetailActivityLayoutTest、TmdbEpisodeAdapterTest,133项通过);TV APK :app:assembleLeanbackArm64_v8aDebug 构建成功;真机 192.168.50.3:5559 安装并实测炫彩详情第3集长按关闭后 UIAutomator 焦点恢复到第3集卡片(CardView [969,353][1404,750],节点文本“3. 救命之恩,以身相许”),触屏切换后遥控左右可继续移动

Task-Guard: tv-colorful-detail-focus-restore-20260908-r2
Backport-of: de4e1f5
Source-PR: Silent1566#240

Verification: PR #240 stable patch-id b40a0a2a11d54bdba8b0e14e8629e89f6127b276 matches exactly; bash ./gradlew :app:compileLeanbackArm64_v8aDebugJavaWithJavac :app:compileMobileArm64_v8aDebugJavaWithJavac --offline --console=plain: BUILD SUCCESSFUL in 1m 35s (58 tasks). Device test not repeated.

Task-Guard: beta-pr240-20260908
Verification: retained docs/beta-sync-review-dev3-20260908-round4.md exactly from merge 14423f1.
Verification: git diff --check; required Phase 3 design anchors present; task_guard check passed

Task-Guard: AD-AUDIO-RULES-V2-P3-DESIGN
Verification: 定向单测、Leanback 构建、diff check、模拟器开启/关闭两种模式跨分组验证

Task-Guard: home-category-edge-scroll-top-focus-20260908
Verification: 53 targeted Leanback ARM64 JVM tests passed (SpeechAdConfigTest 13, SpeechAdRuleCodecTest 18, SpeechAdKeywordSetTest 9, BackupPreferenceFilterTest 11, SpeechAdSettingSourceTest 2; 0 failures/errors/skips); :app:compileLeanbackArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL in 19s; git diff --check passed

Task-Guard: AD-AUDIO-RULES-V2-P3
Verification: 定向 Leanback/Mobile 单测、双端 Java 编译、Leanback Arm64 APK 组装通过;diff check、task guard check、无冲突路径、验证后最终复评通过

Task-Guard: beta-sync-review-dev4-20260909-round3
Verification: 移除误纳入合并提交的预-existing VodActivity.java.bak;task guard scope check 与 staged diff check 通过,生产源码未改动

Task-Guard: beta-sync-review-dev4-20260909-bak-correction
Verification: 任务文档已记录合并提交、修正提交、恢复 tag、远端推送及 PR #242;文档变更通过 task guard scope 与 staged diff 检查

Task-Guard: beta-sync-review-dev4-20260909-close
合并 beta 最新代码并完成 dev4 复评
Verification: Static autoplay policy assertions and git diff --check passed; :app:compileMobileArm64_v8aDebugJavaWithJavac, :app:compileLeanbackArm64_v8aDebugJavaWithJavac, and LiveActivityLayoutTest passed (BUILD SUCCESSFUL)

Task-Guard: autoplay-vod-20260909
…ation (P4)

Verification: P4 focused JVM tests pass: SpeechAdPlaybackHealthTest and AdAudioRuntimeControllerTest.speechSuppressionClosesOnlySpeechAndLeavesFingerprintRunning; Leanback ARM64 debug unit tests pass; Java compiles.

Task-Guard: AD-AUDIO-RULES-V2-P4
Silent1566 and others added 9 commits September 9, 2026 11:06
Verification: Focused test for live playback autoplay policy passed; base commit 9769ca8 remains unchanged; beta merged via origin/beta a65c732 with no conflict.

Task-Guard: beta-sync-review-dev4-20260909-round4
…26-09-09)

Verification: Build and unit tests passed for LeanbackArm64 and MobileArm64 flavors; merge of origin/beta into dev2 completed without conflicts; reviewed changes in app/src and docs.

Task-Guard: beta-sync-review-dev2-20260909-round1
feat(ad-audio): 添加语音广告规则 V2 并合并 beta 最新代码 (2026-09-09)
dev4: 修正自动播放回归测试并记录 beta 合并评审 (2026-09-09 round4)
@YaChengMu
YaChengMu merged commit b6f5c5f into main Sep 10, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants