Compare commits

...

7 commits

Author SHA1 Message Date
Silent1566
e132cd9e04 Merge remote-tracking branch 'origin/beta' into beta 2026-09-08 22:45:16 +08:00
Silent1566
2ab1e25092
Merge pull request #241 from Silent1566/Silent1566/sync-pr-240-beta
fix(beta): 同步 #240,修复 WebHome fm.vod 历史续播
2026-09-08 21:07:01 +08:00
Har01d
b929e51842 fix(webhome): backport fm.vod history resume to beta (#240)
Backport-of: de4e1f5953
Source-PR: Silent1566/webhtv#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
2026-09-08 21:05:33 +08:00
Silent1566
ea6c62c55e merge: 同步 origin/beta 最新代码
Verification: git fetch origin beta 成功;git merge --no-commit --no-ff origin/beta 自动合并成功且无冲突;合并提交后用 git status --short --branch 与 git log -1 --oneline 核验 beta 已同步

Task-Guard: beta-remote-sync-20260908
2026-09-08 20:54:04 +08:00
Silent1566
14423f1a17
Merge pull request #239 from Silent1566/dev3
合并 beta 最新代码并修复 TV 详情焦点恢复
2026-09-08 20:43:23 +08:00
Silent1566
cff018fc7a Merge remote-tracking branch 'origin/beta' 2026-09-08 18:07:25 +08:00
Silent1566
ccdc00bae2 fix(Backup.java): restore missing package and import lines to enable debug build; build mobileArm64_v8aDebug APK and install to 192.168.50.3:5561
Verification: Debug APK built successfully: app/build/outputs/apk/mobileArm64_v8a/debug/app-mobile-arm64_v8a-debug.apk. Installed on emulator 192.168.50.3:5561 via 'adb install -r' and verified with 'adb shell pm path'.

Task-Guard: mobile-debug-apk-build
2026-09-08 09:56:16 +08:00