release: v1.0.1 播放页设置抽屉与共用设置 Fragment

- 菜单键打开右侧抽屉，左侧子菜单（地址管理、切换源、EPG、播放选项）

- 帮助弹窗单独一行展示版本号；切换源子菜单仅显示线路编号

- 更新 CHANGELOG

Made-with: Cursor

Author: yunnysunny

CHANGELOG.md

@@ -21,6 +21,21 @@
 
 - 新增 7 个 PlayerManager 单元测试，覆盖频道切换状态隔离、陈旧回调防护、全部失败后恢复等场景
 
+## [1.0.1] - 2026-03-21
+
+### Added
+
+- 播放页菜单键 / F6：右侧设置抽屉（遮罩 + 面板），不离开播放界面
+- 设置主菜单在右、子菜单在左：地址管理、切换源（仅播放页）、EPG、播放选项；帮助打开独立弹窗
+- `SettingsCollapsibleFragment` 与 `SettingsPanelHost`，播放页与独立设置页共用同一套设置 UI
+- 帮助弹窗内单独一行展示应用版本号（`versionName`）
+
+### Changed
+
+- `SettingsActivity` 改为全屏承载设置 Fragment；原左右分栏布局移除
+- 切换源子菜单仅显示「线路 x」，不展示播放 URL
+- 设置抽屉总宽度约 480dp，便于双栏主/子菜单
+
 ## [1.0.0] - 2026-03-20
 
 ### Added
@@ -44,5 +59,6 @@
 - 自动播放在 Activity 重建时重复触发
 - 刷新播放源时频道 ID 重建导致收藏记录级联删除
 
-[Unreleased]: https://github.com/whyun-android/witv/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/whyun-android/witv/compare/v1.0.1...HEAD
+[1.0.1]: https://github.com/whyun-android/witv/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/whyun-android/witv/releases/tag/v1.0.0

app/src/main/java/com/whyun/witv/ui/PlayerActivity.java

@@ -38,7 +38,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-public class PlayerActivity extends FragmentActivity implements PlayerManager.Callback {
+public class PlayerActivity extends FragmentActivity implements PlayerManager.Callback, SettingsPanelHost {
 
     public static final String EXTRA_CHANNEL_ID = "channel_id";
     public static final String EXTRA_SOURCE_ID = "source_id";
@@ -60,6 +60,8 @@ public class PlayerActivity extends FragmentActivity implements PlayerManager.Ca
     private TextView switchingToast;
     private TextView loadSpeedOverlay;
     private RecyclerView channelListOverlay;
+    private View settingsPanelOverlay;
+    private PlayerView playerView;
 
     private boolean isFavorite = false;
 
@@ -126,6 +128,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         initViews();
         initPlayer();
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.settings_panel_content, new SettingsCollapsibleFragment(), "settings_drawer")
+                    .commitNow();
+        }
         applyLoadSpeedOverlayPreference();
         loadAndPlay();
     }
@@ -144,10 +151,13 @@ private void initViews() {
         loadSpeedOverlay = findViewById(R.id.load_speed_overlay);
         channelListOverlay = findViewById(R.id.channel_list_overlay);
         channelListOverlay.setLayoutManager(new LinearLayoutManager(this));
+
+        settingsPanelOverlay = findViewById(R.id.settings_panel_overlay);
+        findViewById(R.id.settings_scrim).setOnClickListener(v -> hideSettingsPanel());
     }
 
     private void initPlayer() {
-        PlayerView playerView = findViewById(R.id.player_view);
+        playerView = findViewById(R.id.player_view);
         playerView.setUseController(false);
 
         playerManager = new PlayerManager(this);
@@ -398,6 +408,64 @@ private void hideOverlay() {
         overlayVisible = false;
     }
 
+    private void hideSettingsPanel() {
+        SettingsCollapsibleFragment f = (SettingsCollapsibleFragment) getSupportFragmentManager()
+                .findFragmentByTag("settings_drawer");
+        if (f != null) {
+            f.onSettingsDrawerDismiss();
+        }
+        if (settingsPanelOverlay != null) {
+            settingsPanelOverlay.setVisibility(View.GONE);
+        }
+        if (playerView != null) {
+            playerView.requestFocus();
+        }
+    }
+
+    private void showSettingsPanel() {
+        if (settingsPanelOverlay == null) {
+            return;
+        }
+        settingsPanelOverlay.setVisibility(View.VISIBLE);
+        SettingsCollapsibleFragment f = (SettingsCollapsibleFragment) getSupportFragmentManager()
+                .findFragmentByTag("settings_drawer");
+        if (f != null) {
+            f.refreshAndFocus();
+        }
+    }
+
+    private boolean isSettingsPanelVisible() {
+        return settingsPanelOverlay != null && settingsPanelOverlay.getVisibility() == View.VISIBLE;
+    }
+
+    /** 供 {@link SettingsCollapsibleFragment} 读取当前频道以展示「切换源」列表 */
+    public long getCurrentChannelIdForPanel() {
+        return currentChannelId;
+    }
+
+    @Override
+    public boolean shouldShowStreamSwitchGroup() {
+        return currentChannelId > 0;
+    }
+
+    @Override
+    public PlayerManager getPlayerManagerOrNull() {
+        return playerManager;
+    }
+
+    @Override
+    public void onManualStreamSwitch(int index) {
+        if (playerManager != null) {
+            playerManager.manualSwitchSource(index);
+        }
+    }
+
+    @Override
+    public void onPlaybackOverlayPreferenceChanged() {
+        applyLoadSpeedOverlayPreference();
+        startLoadSpeedRefreshIfNeeded();
+    }
+
     private void switchChannel(int direction) {
         if (allChannels == null || allChannels.isEmpty()) return;
 
@@ -438,6 +506,22 @@ private void showChannelList() {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (isSettingsPanelVisible()) {
+            if (keyCode == KeyEvent.KEYCODE_BACK) {
+                SettingsCollapsibleFragment f = (SettingsCollapsibleFragment) getSupportFragmentManager()
+                        .findFragmentByTag("settings_drawer");
+                if (f != null && f.handleBack()) {
+                    return true;
+                }
+                hideSettingsPanel();
+                return true;
+            }
+            if (keyCode == KeyEvent.KEYCODE_MENU || keyCode == KeyEvent.KEYCODE_F6) {
+                hideSettingsPanel();
+                return true;
+            }
+        }
+
         switch (keyCode) {
             case KeyEvent.KEYCODE_DPAD_UP:
                 if (channelListOverlay.getVisibility() != View.VISIBLE) {
@@ -492,7 +576,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 return true;
             case KeyEvent.KEYCODE_MENU:
             case KeyEvent.KEYCODE_F6:
-                startActivity(new android.content.Intent(this, SettingsActivity.class));
+                showSettingsPanel();
                 return true;
             case KeyEvent.KEYCODE_BOOKMARK:
             case KeyEvent.KEYCODE_STAR:

app/src/main/java/com/whyun/witv/ui/SettingsActivity.java

@@ -1,191 +1,40 @@
 package com.whyun.witv.ui;
 
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.whyun.witv.R;
-import com.whyun.witv.data.PreferenceManager;
-import com.whyun.witv.data.db.AppDatabase;
-import com.whyun.witv.data.db.entity.M3USource;
-import com.whyun.witv.data.repository.ChannelRepository;
-import com.whyun.witv.data.repository.EpgRepository;
+import com.whyun.witv.player.PlayerManager;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class SettingsActivity extends FragmentActivity {
-
-    private AppDatabase db;
-    private ChannelRepository channelRepo;
-    private EpgRepository epgRepo;
-    private PreferenceManager preferenceManager;
-    private SourceListAdapter adapter;
-    private EditText epgUrlInput;
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
+public class SettingsActivity extends FragmentActivity implements SettingsPanelHost {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-
-        db = AppDatabase.getInstance(this);
-        channelRepo = new ChannelRepository(this);
-        epgRepo = new EpgRepository(this);
-        preferenceManager = new PreferenceManager(this);
-
-        setupWebHint();
-        setupSourceList();
-        setupSettings();
-        setupAutoPlay();
-        setupShowLoadSpeed();
-    }
-
-    private void setupWebHint() {
-        TextView webHint = findViewById(R.id.web_hint);
-        String ip = getDeviceIp();
-        webHint.setText(String.format("通过浏览器管理：http://%s:9978", ip));
-    }
-
-    private void setupSourceList() {
-        RecyclerView sourceList = findViewById(R.id.source_list);
-        sourceList.setLayoutManager(new LinearLayoutManager(this));
-        adapter = new SourceListAdapter(new ArrayList<>(), this::onActivateSource);
-        sourceList.setAdapter(adapter);
-        loadSources();
-    }
-
-    private void setupSettings() {
-        epgUrlInput = findViewById(R.id.epg_url_input);
-        Button saveEpg = findViewById(R.id.btn_save_epg);
-        Button reloadEpg = findViewById(R.id.btn_reload_epg);
-
-        executor.execute(() -> {
-            M3USource active = db.m3uSourceDao().getActive();
-            if (active != null && active.epgUrl != null) {
-                runOnUiThread(() -> epgUrlInput.setText(active.epgUrl));
-            }
-        });
-
-        saveEpg.setOnClickListener(v -> {
-            String epgUrl = epgUrlInput.getText().toString().trim();
-            executor.execute(() -> {
-                M3USource active = db.m3uSourceDao().getActive();
-                if (active != null) {
-                    active.epgUrl = epgUrl;
-                    db.m3uSourceDao().update(active);
-                    runOnUiThread(() ->
-                            Toast.makeText(this, "EPG 设置已保存", Toast.LENGTH_SHORT).show());
-                }
-            });
-        });
-
-        reloadEpg.setOnClickListener(v -> {
-            executor.execute(() -> {
-                M3USource active = db.m3uSourceDao().getActive();
-                if (active != null && active.epgUrl != null && !active.epgUrl.isEmpty()) {
-                    runOnUiThread(() ->
-                            Toast.makeText(this, "正在刷新 EPG…", Toast.LENGTH_SHORT).show());
-                    try {
-                        epgRepo.loadEpg(active.epgUrl);
-                        preferenceManager.markEpgAutoRefreshSuccess(active.epgUrl);
-                        runOnUiThread(() ->
-                                Toast.makeText(this, "EPG 刷新完成", Toast.LENGTH_SHORT).show());
-                    } catch (Exception e) {
-                        runOnUiThread(() ->
-                                Toast.makeText(this, "EPG 刷新失败: " + e.getMessage(),
-                                        Toast.LENGTH_LONG).show());
-                    }
-                } else {
-                    runOnUiThread(() ->
-                            Toast.makeText(this, "请先设置 EPG 地址", Toast.LENGTH_SHORT).show());
-                }
-            });
-        });
-    }
-
-    private void setupAutoPlay() {
-        CheckBox autoPlayCheck = findViewById(R.id.cb_auto_play_last);
-        autoPlayCheck.setChecked(preferenceManager.isAutoPlayLastEnabled());
-        autoPlayCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            preferenceManager.setAutoPlayLast(isChecked);
-            Toast.makeText(this,
-                    isChecked ? "已开启启动播放上次频道" : "已关闭启动播放上次频道",
-                    Toast.LENGTH_SHORT).show();
-        });
-    }
-
-    private void setupShowLoadSpeed() {
-        CheckBox cb = findViewById(R.id.cb_show_load_speed);
-        cb.setChecked(preferenceManager.isShowLoadSpeedOverlay());
-        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            preferenceManager.setShowLoadSpeedOverlay(isChecked);
-            Toast.makeText(this,
-                    isChecked ? "已开启播放页加载速度显示" : "已关闭播放页加载速度显示",
-                    Toast.LENGTH_SHORT).show();
-        });
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.settings_fragment_container, new SettingsCollapsibleFragment())
+                    .commit();
+        }
     }
 
-    private void loadSources() {
-        executor.execute(() -> {
-            List<M3USource> sources = db.m3uSourceDao().getAll();
-            runOnUiThread(() -> adapter.updateData(sources));
-        });
+    @Override
+    public boolean shouldShowStreamSwitchGroup() {
+        return false;
     }
 
-    private void onActivateSource(M3USource source) {
-        executor.execute(() -> {
-            db.m3uSourceDao().deactivateAll();
-            db.m3uSourceDao().activate(source.id);
-
-            try {
-                List<com.whyun.witv.data.db.entity.Channel> channels =
-                        db.channelDao().getBySource(source.id);
-                if (channels.isEmpty()) {
-                    channelRepo.loadSource(source);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            loadSources();
-            runOnUiThread(() ->
-                    Toast.makeText(this, "已切换到: " + source.name, Toast.LENGTH_SHORT).show());
-        });
+    @Override
+    public PlayerManager getPlayerManagerOrNull() {
+        return null;
     }
 
-    private String getDeviceIp() {
-        try {
-            WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
-            if (wifiManager != null) {
-                WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-                int ipInt = wifiInfo.getIpAddress();
-                if (ipInt != 0) {
-                    return String.format(Locale.US, "%d.%d.%d.%d",
-                            (ipInt & 0xff), (ipInt >> 8 & 0xff),
-                            (ipInt >> 16 & 0xff), (ipInt >> 24 & 0xff));
-                }
-            }
-        } catch (Exception ignored) {
-        }
-        return "0.0.0.0";
+    @Override
+    public void onManualStreamSwitch(int index) {
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        executor.shutdown();
+    public void onPlaybackOverlayPreferenceChanged() {
     }
 }