chore(release): v1.1.0

See CHANGELOG.md for details.

Made-with: Cursor

Author: yunnysunny

CHANGELOG.md

@@ -4,6 +4,30 @@
 
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)。
 
+## [1.1.0] - 2026-03-22
+
+### Added
+
+- HLS 播放列表客户端修正：识别源站将 `#EXT-X-MEDIA-SEQUENCE` 误写为「最后一片序号」时，改写为第一片序号；修正 `##EXT-X-VERSION` 双井号（`HlsMediaSequenceFixUtil` + `M3u8RewritingDataSource` 注入 `DefaultDataSource`）
+- 对应单元测试 `HlsMediaSequenceFixUtilTest`
+- 首页「设置」分类：可点击的快捷行（`SettingsShortcutEntry` / `SettingsShortcutPresenter`），仅确认后打开设置，避免焦点路过即弹出
+- 设置帮助拆分为子项：媒体信息、帮助说明、关于应用；关于中展示构建时间（`BuildConfig.BUILD_TIME_MILLIS`）
+- 频道列表长按切换该行收藏（`ChannelListAdapter`）
+- 超时换源偏好可在非播放页设置（`MainActivity` / `SettingsActivity` 等展示该分组）
+
+### Changed
+
+- Media3 升级至 **1.10.0-rc01**；`minSdk` 提升至 **23**（与 Media3 1.9+ / AndroidX 对齐）
+- 首页设置浮层改为锚定窗口**左下角**；`MainActivity` `onPause` 时收起设置层，避免后台 Activity 仍挂起可见浮层
+- 无 M3U 源时空状态：隐藏 Browse 根视图并为「刷新」请求焦点，避免 Leanback 抢走焦点
+- 设置抽屉内从**左侧子菜单**按 **右键** 显式回到**右侧主菜单**当前分类，修复切换线路后 `notifyDataSetChanged` 导致焦点链断裂、无法返回父菜单的问题
+
+### Fixed
+
+- `SettingsCollapsibleFragment`：切换播放线路后子菜单刷新，方向键右键无法回到主菜单
+
+[1.1.0]: https://github.com/whyun-android/witv/compare/v1.0.2...v1.1.0
+
 ## [1.0.2] - 2026-03-21
 
 ### Added

README.md

@@ -14,18 +14,18 @@ Android TV M3U 直播播放器，使用原生 ExoPlayer 播放，支持多源自
 
 | 按键 | 功能 |
 |------|------|
-| 确认键 / OK | 显示频道列表和 EPG 信息 |
-| 上 / 下键 | 切换上一个 / 下一个频道 |
-| 左键 | 显示频道列表 |
+| 确认键 / OK | 显示频道列表（不自动展开 EPG 信息栏）；列表在焦点停留无操作约 10 秒后自动关闭 |
+| 上 / 下键 | 切换上一个 / 下一个频道（可在设置中反转方向） |
+| 信息键 / 空格 | 显示 / 隐藏 EPG 与信号信息面板 |
 | 右键 / 返回键 | 关闭频道列表和信息面板 |
 | 数字键 0-9 | 输入频道号直接跳转 |
-| 菜单键 | 打开设置页面 |
+| 菜单键 | 打开设置面板；首页左侧选中「设置」分类即打开设置层（右侧不再显示设置按钮） |
 
 ## 技术栈
 
 | 组件 | 技术 |
 |------|------|
-| 播放器 | Media3 ExoPlayer 1.5.1 |
+| 播放器 | Media3 ExoPlayer 1.10.0-rc01 |
 | TV 界面 | Leanback 1.2.0 |
 | 数据库 | Room 2.6.1 |
 | HTTP 服务器 | NanoHTTPD 2.3.1 |

app/build.gradle

@@ -6,12 +6,18 @@ android {
     namespace 'com.whyun.witv'
     compileSdk 36
 
+    buildFeatures {
+        buildConfig true
+    }
+
     defaultConfig {
         applicationId "com.whyun.witv"
-        minSdk 21
+        // Media3 1.9+ 与 AndroidX 对齐，要求 minSdk 23
+        minSdk 23
         targetSdk 34
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.1.0"
+        buildConfigField "long", "BUILD_TIME_MILLIS", "${System.currentTimeMillis()}L"
     }
 
     buildTypes {
@@ -28,17 +34,19 @@ android {
 }
 
 dependencies {
+    def media3_version = "1.10.0-rc01"
+
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.robolectric:robolectric:4.14.1"
     testImplementation "androidx.test:core:1.6.1"
 
-    // Media3 ExoPlayer
-    implementation "androidx.media3:media3-exoplayer:1.5.1"
-    implementation "androidx.media3:media3-exoplayer-hls:1.5.1"
-    implementation "androidx.media3:media3-exoplayer-dash:1.5.1"
-    implementation "androidx.media3:media3-ui:1.5.1"
-    implementation "androidx.media3:media3-session:1.5.1"
-    implementation "androidx.media3:media3-common:1.5.1"
+    // Media3 ExoPlayer（RC，升级后请在目标盒子上做播放回归）
+    implementation "androidx.media3:media3-exoplayer:$media3_version"
+    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
+    implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
+    implementation "androidx.media3:media3-ui:$media3_version"
+    implementation "androidx.media3:media3-session:$media3_version"
+    implementation "androidx.media3:media3-common:$media3_version"
 
     // Leanback TV
     implementation "androidx.leanback:leanback:1.2.0-alpha04"

app/src/main/java/com/whyun/witv/data/PreferenceManager.java

@@ -12,6 +12,14 @@ public class PreferenceManager {
     private static final String KEY_LAST_PLAY_STREAM_INDEX = "last_play_stream_index";
     private static final String KEY_AUTO_PLAY_LAST = "auto_play_last";
     private static final String KEY_SHOW_LOAD_SPEED_OVERLAY = "show_load_speed_overlay";
+    private static final String KEY_REVERSE_CHANNEL_KEYS = "reverse_channel_keys";
+    private static final String KEY_SOURCE_SWITCH_TIMEOUT_MS = "source_switch_timeout_ms";
+
+    /** 单线路超时未起播则换源；可选值见 {@link #normalizeSourceSwitchTimeoutMs(long)} */
+    public static final long DEFAULT_SOURCE_SWITCH_TIMEOUT_MS = 15_000L;
+    private static final long[] ALLOWED_SOURCE_TIMEOUTS_MS = {
+            5_000L, 10_000L, 15_000L, 20_000L, 25_000L, 30_000L
+    };
     private static final String KEY_LAST_EPG_AUTO_REFRESH_AT = "last_epg_auto_refresh_at";
     private static final String KEY_LAST_EPG_AUTO_REFRESH_URL = "last_epg_auto_refresh_url";
 
@@ -75,6 +83,37 @@ public boolean isShowLoadSpeedOverlay() {
         return prefs.getBoolean(KEY_SHOW_LOAD_SPEED_OVERLAY, false);
     }
 
+    /** 上/下键换台方向与默认相反 */
+    public void setReverseChannelKeys(boolean enabled) {
+        prefs.edit().putBoolean(KEY_REVERSE_CHANNEL_KEYS, enabled).apply();
+    }
+
+    public boolean isReverseChannelKeysEnabled() {
+        return prefs.getBoolean(KEY_REVERSE_CHANNEL_KEYS, false);
+    }
+
+    public long getSourceSwitchTimeoutMs() {
+        long v = prefs.getLong(KEY_SOURCE_SWITCH_TIMEOUT_MS, DEFAULT_SOURCE_SWITCH_TIMEOUT_MS);
+        return normalizeSourceSwitchTimeoutMs(v);
+    }
+
+    public void setSourceSwitchTimeoutMs(long ms) {
+        prefs.edit().putLong(KEY_SOURCE_SWITCH_TIMEOUT_MS, normalizeSourceSwitchTimeoutMs(ms)).apply();
+    }
+
+    public static long normalizeSourceSwitchTimeoutMs(long ms) {
+        for (long a : ALLOWED_SOURCE_TIMEOUTS_MS) {
+            if (a == ms) {
+                return ms;
+            }
+        }
+        return DEFAULT_SOURCE_SWITCH_TIMEOUT_MS;
+    }
+
+    public static int[] getAllowedSourceTimeoutSeconds() {
+        return new int[]{5, 10, 15, 20, 25, 30};
+    }
+
     public void clearLastChannel() {
         prefs.edit()
                 .remove(KEY_LAST_CHANNEL_ID)

app/src/main/java/com/whyun/witv/player/HlsMediaSequenceFixUtil.java

@@ -0,0 +1,106 @@
+package com.whyun.witv.player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 修正部分 IPTV 源错误的 media playlist：将误设为「最后一片序号」的
+ * {@code #EXT-X-MEDIA-SEQUENCE} 改回「第一片序号」。仅在检测到典型错误模式时改写。
+ */
+public final class HlsMediaSequenceFixUtil {
+
+    private static final Pattern MEDIA_SEQUENCE_LINE = Pattern.compile(
+            "^#EXT-X-MEDIA-SEQUENCE:(\\d+)\\s*$");
+    private static final Pattern KEY2_PARAM = Pattern.compile("[?&]key2=(\\d+)");
+    private static final Pattern TS_SUFFIX = Pattern.compile("(\\d+)\\.ts$");
+
+    private HlsMediaSequenceFixUtil() {
+    }
+
+    /**
+     * 修正 playlist 文本（UTF-8 语义）；无需改写时返回原字符串引用。
+     */
+    public static String fixPlaylistIfNeeded(String playlist) {
+        if (playlist == null || playlist.isEmpty() || !playlist.contains("#EXTM3U")) {
+            return playlist;
+        }
+        String withVersionFix = playlist.replace("##EXT-X-VERSION:", "#EXT-X-VERSION:");
+        if (!withVersionFix.contains("#EXT-X-MEDIA-SEQUENCE")) {
+            return withVersionFix;
+        }
+
+        String[] lines = withVersionFix.split("\\r\\n|\\n|\\r", -1);
+        int mediaSeqLineIndex = -1;
+        long declaredM = -1L;
+        for (int i = 0; i < lines.length; i++) {
+            String trimmed = lines[i].trim();
+            Matcher m = MEDIA_SEQUENCE_LINE.matcher(trimmed);
+            if (m.matches()) {
+                mediaSeqLineIndex = i;
+                declaredM = Long.parseLong(m.group(1));
+                break;
+            }
+        }
+        if (mediaSeqLineIndex < 0) {
+            return withVersionFix;
+        }
+
+        List<Long> segmentIds = new ArrayList<>();
+        for (int i = 0; i < lines.length - 1; i++) {
+            if (lines[i].trim().startsWith("#EXTINF")) {
+                String next = lines[i + 1].trim();
+                if (!next.isEmpty() && !next.startsWith("#")) {
+                    Long id = extractSegmentId(next);
+                    if (id != null) {
+                        segmentIds.add(id);
+                    }
+                }
+            }
+        }
+
+        if (segmentIds.size() < 2) {
+            return withVersionFix;
+        }
+
+        long s0 = segmentIds.get(0);
+        long sLast = segmentIds.get(segmentIds.size() - 1);
+        for (int j = 0; j < segmentIds.size(); j++) {
+            if (segmentIds.get(j) != s0 + j) {
+                return withVersionFix;
+            }
+        }
+        if (declaredM != sLast || declaredM == s0) {
+            return withVersionFix;
+        }
+
+        lines[mediaSeqLineIndex] = "#EXT-X-MEDIA-SEQUENCE:" + s0;
+        return joinLines(lines);
+    }
+
+    private static String joinLines(String[] lines) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < lines.length; i++) {
+            if (i > 0) {
+                sb.append('\n');
+            }
+            sb.append(lines[i]);
+        }
+        return sb.toString();
+    }
+
+    private static Long extractSegmentId(String uriLine) {
+        Matcher key2 = KEY2_PARAM.matcher(uriLine);
+        if (key2.find()) {
+            return Long.parseLong(key2.group(1));
+        }
+        int q = uriLine.indexOf('?');
+        String pathPart = q >= 0 ? uriLine.substring(0, q) : uriLine;
+        Matcher ts = TS_SUFFIX.matcher(pathPart);
+        if (ts.find()) {
+            return Long.parseLong(ts.group(1));
+        }
+        return null;
+    }
+}