v9.4.2: 菜单键打开设置页 + 三重诊断(可解析/onCreate标记) + 换线移入设置页

2026-10-10 13:44:26 +08:00
1 parent 74ef196ee5
commit 1c35ecec2b
@@ -19,8 +19,8 @@ android {
        applicationId = "com.iptv807.tv"
        minSdk = 21
        targetSdk = 35
-        versionCode = 941
-        versionName = "9.4.1"
+        versionCode = 942
+        versionName = "9.4.2"
    }

    signingConfigs {
@@ -408,16 +408,38 @@ class MainActivity : Activity() {
        }
    }

-    /** 打开授权/激活页面（含卡密激活与购买入口） */
-    private fun openAuthPage() {
-        try {
-            startActivity(Intent(this, SettingsActivity::class.java))
-        } catch (e: Exception) {
-            statusText.text = "打开授权页失败: ${e.javaClass.simpleName}: ${e.message}"
-            android.widget.Toast.makeText(this, "打开授权页失败: ${e.message}", android.widget.Toast.LENGTH_LONG).show()
+    /** 菜单键/其他入口统一打开设置页；带三重诊断，打不开时屏幕上有原因 */
+    private fun openSettingsPage() {
+        val intent = Intent(this, SettingsActivity::class.java)
+        // ① 预检查：系统能否解析到这个 Activity（manifest 没注册会返回 null）
+        val resolve = try { packageManager.resolveActivity(intent, 0) } catch (e: Exception) { null }
+        if (resolve == null) {
+            statusText.text = "⚠ 设置页无法解析：manifest 未注册 SettingsActivity"
+            android.widget.Toast.makeText(this, "设置页无法解析（manifest 未注册）", android.widget.Toast.LENGTH_LONG).show()
+            return
        }
+        // ② 启动
+        val before = try { getSharedPreferences("iptv_main", MODE_PRIVATE).getLong("settings_opened_at", 0L) } catch (e: Exception) { 0L }
+        try {
+            startActivity(intent)
+        } catch (e: Exception) {
+            statusText.text = "⚠ 打开设置失败: ${e.javaClass.simpleName}: ${e.message}"
+            android.widget.Toast.makeText(this, "打开设置失败: ${e.message}", android.widget.Toast.LENGTH_LONG).show()
+            return
+        }
+        // ③ 1.4 秒后核对：SettingsActivity.onCreate 有没有真的跑起来
+        handler.postDelayed({
+            val after = try { getSharedPreferences("iptv_main", MODE_PRIVATE).getLong("settings_opened_at", 0L) } catch (e: Exception) { 0L }
+            if (after <= before) {
+                statusText.text = "⚠ 设置页未响应：onCreate 未执行（启动被拦截或立刻结束）"
+                android.widget.Toast.makeText(this, "设置页未响应，请把这行字告诉我", android.widget.Toast.LENGTH_LONG).show()
+            }
+        }, 1400)
    }

+    /** 打开授权/激活页面（就是设置页：卡密激活 + 购买入口 + 撤销授权） */
+    private fun openAuthPage() { openSettingsPage() }
+
    /** 首次启动：简易使用教程（可关闭，只弹一次） */
    private fun maybeShowTutorial() {
        try {
@@ -606,13 +628,7 @@ class MainActivity : Activity() {
            setItemsCanFocus(false)
            onItemClickListener = AdapterView.OnItemClickListener { _, _, pos, _ ->
                if (pos == 0) {
-                    try { startActivity(Intent(this@MainActivity, SettingsActivity::class.java)) }
-                    catch (e: Exception) {
-                        statusText.text = "打开设置失败: ${e.javaClass.simpleName}: ${e.message}"
-                        android.widget.Toast.makeText(this@MainActivity, "打开设置失败: ${e.message}", android.widget.Toast.LENGTH_LONG).show()
-                        return@OnItemClickListener
-                    }
-                    hidePanel(); return@OnItemClickListener
+                    openSettingsPage(); hidePanel(); return@OnItemClickListener
                }
                if (pos == 0) return@OnItemClickListener
                curGroupPos = pos - 1
@@ -943,13 +959,7 @@ class MainActivity : Activity() {
                    if (panelCol == 0) {
                        val np = groupAdapter?.selected ?: 0
                        if (np == 0) {
-                            // 保险：打开失败要能在屏幕上看到原因，便于排查
-                            try { startActivity(Intent(this, SettingsActivity::class.java)) }
-                            catch (e: Exception) {
-                                statusText.text = "打开设置失败: ${e.javaClass.simpleName}: ${e.message}"
-                                android.widget.Toast.makeText(this@MainActivity, "打开设置失败: ${e.message}", android.widget.Toast.LENGTH_LONG).show()
-                                return true
-                            }
+                            openSettingsPage()   // 统一走带诊断的入口
                            hidePanel()
                        }
                        else { curGroupPos = np - 1; updateChannelListOfGroup(curGroupPos); panelCol = 1; refreshPanelHighlight() }
@@ -967,7 +977,8 @@ class MainActivity : Activity() {
            // ★ 修复：返回键必须弹退出确认，绝不直接 finish（原来漏了这个分支，
            //   导致 BACK 落到 super.onKeyDown() = 系统默认无提示退出）
            KeyEvent.KEYCODE_BACK -> { exitApp(); return true }
-            KeyEvent.KEYCODE_MENU -> { autoSwitchLine(); return true }
+            // ★ 菜单键 → 打开设置页（原来这里是「换线」，换线已移到设置页里）
+            KeyEvent.KEYCODE_MENU -> { openSettingsPage(); return true }
            KeyEvent.KEYCODE_CHANNEL_UP -> { playChannel((currentChannel - 1 + channels.size) % channels.size); return true }
            KeyEvent.KEYCODE_CHANNEL_DOWN -> { playChannel((currentChannel + 1) % channels.size); return true }
            KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN -> {
@@ -1309,6 +1320,14 @@ class MainActivity : Activity() {
            playRequested = -1
            if (idx >= 0) playChannel(idx)
        }
+        // 设置页点「切换线路」→ 回来执行（原菜单键功能，现已移到设置页）
+        run {
+            val sp = getSharedPreferences("iptv_main", MODE_PRIVATE)
+            if (sp.getString("pending_action", "") == "switch_line") {
+                sp.edit().remove("pending_action").apply()
+                autoSwitchLine()
+            }
+        }
    }

    /** 点「继续播放」→ 重新连接当前频道（直播流最稳的恢复方式） */
@@ -214,8 +214,33 @@ class SettingsActivity : Activity() {
                startActivity(Intent(this@SettingsActivity, ShopActivity::class.java))
            }
            root.addView(btn, LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 20 })
        }
+
+        // ===== 其它操作 =====
+        root.addView(TextView(this).apply {
+            text = "其它操作"
+            textSize = 15f; setTextColor(Color.parseColor("#7AA7D9"))
+            setPadding(0, 8, 0, 8)
+        })
+        // 原菜单键的功能（手动换线），现在放在这里
+        val switchBtn = mkAction("切换线路（当前线路不通时手动换）") {
+            try {
+                getSharedPreferences("iptv_main", MODE_PRIVATE).edit()
+                    .putString("pending_action", "switch_line").apply()
+            } catch (e: Exception) { }
+            statusText.text = "已请求切换线路，返回主界面后生效"
+            android.widget.Toast.makeText(this, "返回主界面后自动切换线路", android.widget.Toast.LENGTH_LONG).show()
+            try { finish() } catch (e: Exception) { }
+        }
+        root.addView(switchBtn, LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 20 })
+
+        // ★ 诊断标记：证明本页 onCreate 确实跑到了（主界面 1.4 秒后会核对）
+        try {
+            getSharedPreferences("iptv_main", MODE_PRIVATE).edit()
+                .putLong("settings_opened_at", System.currentTimeMillis()).apply()
+        } catch (e: Exception) { }
    }

    /** 撤销本机授权：清除本地授权信息 → 恢复免费模式，可重新输入卡密或换机 */