v9.4.9: TV 桌面 banner 换新图并修正为 640x360(16:9 符合 320x180 规范)

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
         applicationId = "com.iptv807.tv"
         minSdk = 21
         targetSdk = 35
-        versionCode = 940
-        versionName = "9.4.0"
+        versionCode = 949
+        versionName = "9.4.9"
     }
 
     signingConfigs {

app/src/main/java/com/iptv807/tv/AiSettingsActivity.kt

@@ -96,4 +96,8 @@ class AiSettingsActivity : Activity() {
             }.start()
         }
     }
+    override fun onKeyDown(keyCode: Int, event: android.view.KeyEvent?): Boolean {
+        if (keyCode == android.view.KeyEvent.KEYCODE_BACK) { finish(); return true }
+        return super.onKeyDown(keyCode, event)
+    }
 }

app/src/main/java/com/iptv807/tv/AuthApi.kt

@@ -45,6 +45,18 @@ object AuthApi {
         val installId: Long = 0
     )
 
+    /** 授权系统公告（AnnouncementController → GET /api/public/announcements） */
+    data class Announcement(
+        val id: Int = 0,
+        val title: String = "",
+        val content: String = "",
+        val type: String = "notice",     // system / update / promo / notice
+        val isTop: Boolean = false,
+        val isPopup: Boolean = false,    // 后台「弹窗」开关
+        val linkUrl: String = "",
+        val createdAt: String = ""
+    )
+
     /** 当前应用版本号（用于 client_version 与版本比较） */
     fun clientVersion(ctx: Context): String = try {
         ctx.packageManager.getPackageInfo(ctx.packageName, 0).versionName ?: "0.0.0"
@@ -93,6 +105,39 @@ object AuthApi {
         return info
     }
 
+    /**
+     * 拉取授权系统公告（网络请求，必须放后台线程）
+     * GET /api/public/announcements?target=client&project_id=2&limit=10
+     *   无需 X-Api-Key（实测无 Key 也 200）
+     *   过滤：status=1 + 生效期内 + target∈{all,client} + project_id∈{null,2}
+     * 返回：data.list 全部有效公告；data.popup 里 is_popup=1 的（后台"弹窗"开关）
+     */
+    fun fetchAnnouncements(projectId: Int = 2, limit: Int = 10): List<Announcement> {
+        val path = "/api/public/announcements?target=client&project_id=$projectId&limit=" +
+                limit.coerceIn(1, 50)
+        val r = get(path)
+        if (r.optInt("code", 0) != 200) {
+            lastError = "公告 code=${r.optInt("code", 0)} ${r.optString("message")}"
+            return emptyList()
+        }
+        val arr = r.optJSONObject("data")?.optJSONArray("list") ?: return emptyList()
+        val out = ArrayList<Announcement>()
+        for (i in 0 until arr.length()) {
+            val o = arr.optJSONObject(i) ?: continue
+            out.add(Announcement(
+                id = o.optInt("id", 0),
+                title = o.optString("title"),
+                content = o.optString("content"),
+                type = o.optString("type", "notice"),
+                isTop = o.optInt("is_top", 0) == 1,
+                isPopup = o.optInt("is_popup", 0) == 1,
+                linkUrl = o.optString("link_url"),
+                createdAt = o.optString("created_at")
+            ))
+        }
+        return out
+    }
+
     /** 心跳：仅更新在线时间（网络请求，必须放后台线程） */
     @JvmOverloads
     fun heartbeat(machineId: String, cardKey: String = "", ctx: Context? = null): Boolean {
@@ -107,6 +152,25 @@ object AuthApi {
         return ok
     }
 
+    /** GET 请求（公告接口是 GET，且不需要 X-Api-Key） */
+    private fun get(path: String): JSONObject = try {
+        val conn = (URL(BASE + path).openConnection() as HttpURLConnection).apply {
+            requestMethod = "GET"
+            connectTimeout = 10_000
+            readTimeout = 15_000
+            setRequestProperty("Accept", "application/json")
+            setRequestProperty("User-Agent", "iptv807-tv")
+        }
+        val code = conn.responseCode
+        val stream = if (code in 200..299) conn.inputStream else conn.errorStream
+        val text = stream?.bufferedReader()?.use(BufferedReader::readText) ?: ""
+        conn.disconnect()
+        JSONObject(if (text.isBlank()) "{}" else text)
+    } catch (e: Exception) {
+        lastError = "GET ${e.javaClass.simpleName}: ${e.message}"
+        JSONObject()
+    }
+
     private fun post(path: String, body: JSONObject): JSONObject {
         return try {
             val conn = (URL(BASE + path).openConnection() as HttpURLConnection).apply {

app/src/main/java/com/iptv807/tv/LoginActivity.kt

@@ -140,4 +140,9 @@ class LoginActivity : Activity() {
         startActivity(Intent(this, MainActivity::class.java))
         finish()
     }
+    /** ★ 返回键显式处理（原来缺失 → 走系统默认，用户按返回无提示） */
+    override fun onKeyDown(keyCode: Int, event: android.view.KeyEvent?): Boolean {
+        if (keyCode == android.view.KeyEvent.KEYCODE_BACK) { finish(); return true }
+        return super.onKeyDown(keyCode, event)
+    }
 }

app/src/main/java/com/iptv807/tv/MainActivity.kt

@@ -99,9 +99,24 @@ class MainActivity : Activity() {
     private var confirmOverlay: View? = null
     /** 右上角「立即授权」按钮（未授权时显示） */
     private var authBtn: TextView? = null
+    /** 右下角「已授权」小字标识（已授权时显示，未授权隐藏） */
+    private var authStateText: TextView? = null
     /** 首次启动简易教程遮罩 */
     private var tutorialOverlay: View? = null
     private var tutorialVisible = false
+    /** 公告弹窗（授权系统 AnnouncementController 发布的） */
+    private var annOverlay: View? = null
+    private var annVisible = false
+    private var annOkBtn: TextView? = null
+    private var annTitle: TextView? = null
+    private var annBody: TextView? = null
+    private var annTypeTv: TextView? = null
+    private var curAnnId = 0
+    private var annRetry = 0
+    /** 更新弹窗的可聚焦按钮 + 当前焦点索引（遥控器左右切换用） */
+    private var updBtns: Array<TextView?> = emptyArray()
+    private var updFocusIdx = 0
+    private var updForce = false
     // 安装统计 + 版本推送
     private var updateOverlay: View? = null
     private var pendingUpdate: AuthApi.UpdateInfo? = null
@@ -216,6 +231,20 @@ class MainActivity : Activity() {
             ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP or Gravity.END)
         root.addView(rightCol, rcLP)
 
+        // 4b) 右下角：已授权标识（小字，不打扰观看；未授权时隐藏）
+        authStateText = TextView(this).apply {
+            text = "✓ 已授权"
+            textSize = 12f
+            setTextColor(0xB3FFFFFF.toInt())      // 70% 白，弱化存在感
+            setBackgroundColor(0x59000000.toInt()) // 35% 黑底，保证在亮画面上也看得清
+            setPadding(14, 6, 14, 6)
+            setShadowLayer(3f, 1f, 1f, Color.BLACK)
+            visibility = View.GONE
+        }
+        root.addView(authStateText, FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
+            Gravity.BOTTOM or Gravity.END).apply { setMargins(0, 0, 26, 26) })
+
         // 5) 数字键大字
         digitText = TextView(this).apply {
             textSize = 56f; setTextColor(Color.WHITE)
@@ -229,8 +258,9 @@ class MainActivity : Activity() {
         // 6) 加载罩
         loadingMask = FrameLayout(this).apply { setBackgroundColor(0xB2000000u.toInt()); visibility = View.GONE }
         loadingText = TextView(this).apply {
-            textSize = 28f; setTextColor(Color.WHITE); gravity = Gravity.CENTER
-            setShadowLayer(6f, 3f, 3f, Color.BLACK)
+            textSize = 16f; setTextColor(0xE6FFFFFF.toInt()); gravity = Gravity.CENTER
+            setShadowLayer(4f, 2f, 2f, Color.BLACK)
+            setPadding(32, 0, 32, 0)
         }
         loadingMask.addView(loadingText, FrameLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
@@ -300,6 +330,7 @@ class MainActivity : Activity() {
         window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         checkLicense()
         startInstallTracking()   // 安装统计 + 检查新版本
+        fetchAnnouncement()      // ★ 拉取授权系统公告（3 秒后，避开启动高峰；更新弹窗优先）
         if (savedInstanceState == null && channels.isNotEmpty()) {
             val defIdx = channels.indexOfFirst { it.name.contains("TVB翡翠台") }.let { if (it >= 0) it else 0 }
             playChannel(defIdx)
@@ -347,7 +378,11 @@ class MainActivity : Activity() {
             runOnUiThread {
                 isVip = r.ok
                 prefs.edit().putBoolean("is_vip", r.ok).apply()
-                if (r.ok) { trialText.visibility = View.GONE; trialText.text = "VIP"; showAuthButton(false) } else enterFreeMode()
+                if (r.ok) {
+                    trialText.visibility = View.GONE; trialText.text = "VIP"
+                    showAuthButton(false)
+                    showAuthState(true)          // 右下角显示「✓ 已授权」
+                } else enterFreeMode()
             }
         }.start()
     }
@@ -355,10 +390,20 @@ class MainActivity : Activity() {
     private fun enterFreeMode() {
         trialText.visibility = View.VISIBLE
         showAuthButton(true)
+        showAuthState(false)         // 免费模式下不显示右下角标识
         handler.removeCallbacks(uiTick)
         handler.post(uiTick)
     }
 
+    /** 右下角「✓ 已授权」标识 显示/隐藏 */
+    private fun showAuthState(show: Boolean) {
+        runOnUiThread {
+            val t = authStateText ?: return@runOnUiThread
+            t.visibility = if (show) View.VISIBLE else View.GONE
+            t.text = if (show) "✓ 已授权" else ""
+        }
+    }
+
     /** 显示/隐藏右上角「立即授权」按钮 */
     private fun showAuthButton(show: Boolean) {
         runOnUiThread {
@@ -377,15 +422,37 @@ class MainActivity : Activity() {
         }
     }
 
-    /** 打开授权/激活页面（含卡密激活与购买入口） */
-    private fun openAuthPage() {
+    /** 菜单键/其他入口统一打开设置页；带三重诊断，打不开时屏幕上有原因 */
+    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(this, SettingsActivity::class.java))
+            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()
+            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() {
@@ -575,13 +642,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
@@ -829,6 +890,40 @@ class MainActivity : Activity() {
             }
             return true
         }
+        // ★ 更新弹窗显示时：所有按键都由弹窗接管。
+        //   否则会落到下面的 showPanel()/exitApp()/换台 —— 遥控器就"选不了"了
+        if (isUpdateDialogVisible()) {
+            when (keyCode) {
+                KeyEvent.KEYCODE_BACK -> { hideUpdateDialog(); return true }
+
+                KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER,
+                KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_SPACE -> {
+                    val btn = updBtns.getOrNull(updFocusIdx)
+                        ?.takeIf { it.visibility == View.VISIBLE }
+                        ?: updBtns.filterNotNull().firstOrNull { it.visibility == View.VISIBLE }
+                    btn?.performClick()
+                    return true
+                }
+
+                KeyEvent.KEYCODE_DPAD_LEFT,  KeyEvent.KEYCODE_DPAD_UP   -> { moveUpdateFocus(-1); return true }
+                KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_DOWN -> { moveUpdateFocus( 1); return true }
+
+                else -> return true   // 数字键 / 菜单键 等全部吞掉（弹窗期间不能换台、不能进设置）
+            }
+        }
+
+        // ★ 公告弹窗显示时：按键由弹窗接管（OK/返回都 = 确认关闭；吞掉数字键/菜单键）
+        if (isAnnDialogVisible()) {
+            when (keyCode) {
+                KeyEvent.KEYCODE_BACK,
+                KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER,
+                KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_SPACE -> {
+                    hideAnnouncement(); return true
+                }
+                else -> return true
+            }
+        }
+
         // 退出确认框显示时：返回=取消，其余交给按钮焦点系统处理（左右切换，OK 确认）
         if (confirmVisible) {
             if (keyCode == KeyEvent.KEYCODE_BACK) { hideExitConfirm(); return true }
@@ -912,13 +1007,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() }
@@ -936,7 +1025,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 -> {
@@ -1031,38 +1121,177 @@ class MainActivity : Activity() {
         handler.postDelayed(heartbeatTask, 60 * 1000L)   // 1 分钟后首次心跳
     }
 
+    /**
+     * 拉取授权系统公告，若有「弹窗」开关打开且未读过的，则弹给用户看。
+     * 去重：iptv_main 的 ann_seen_id 记录最后看过的公告 id，同一条只弹一次。
+     */
+    private fun fetchAnnouncement(delayMs: Long = 3000L) {
+        handler.postDelayed({
+            Thread {
+                val list = try { AuthApi.fetchAnnouncements(projectId = 2, limit = 10) }
+                           catch (e: Exception) { emptyList() }
+                // 只弹 is_popup=1 的；按 id 升序取最新一条未读
+                val sp = getSharedPreferences("iptv_main", MODE_PRIVATE)
+                val seen = sp.getInt("ann_seen_id", 0)
+                val target = list.filter { it.isPopup && it.id > seen }
+                                 .maxByOrNull { it.id }
+                if (target != null) {
+                    runOnUiThread {
+                        // 更新弹窗优先：它没关掉就延迟再试（最多 15 次 x 2 秒）
+                        if (isUpdateDialogVisible() && annRetry < 15) {
+                            annRetry++
+                            fetchAnnouncement(2000L)
+                        } else if (!annVisible) {
+                            showAnnouncement(target)
+                        }
+                    }
+                }
+            }.start()
+        }, delayMs)
+    }
+
+    /** 公告弹窗（自绘，和更新弹窗同一套三件套：focusable + requestFocus + onKeyDown 分支） */
+    private fun showAnnouncement(a: AuthApi.Announcement) {
+        if (annOverlay == null) {
+            val dm = resources.displayMetrics
+            val wDp = dm.widthPixels / dm.density
+            val sc = when {
+                wDp < 500f -> 0.62f      // 手机竖屏
+                wDp < 760f -> 0.80f      // 手机横屏 / 小平板
+                else       -> 1.00f      // TV
+            }
+            fun sp(v: Float): Float = v * sc
+            fun px(v: Int): Int = (v * sc).toInt()
+
+            val mask = FrameLayout(this).apply { setBackgroundColor(0xCC000000u.toInt()); isClickable = true }
+            val card = LinearLayout(this).apply {
+                orientation = LinearLayout.VERTICAL
+                setBackgroundColor(Color.parseColor("#22262E"))
+                setPadding(px(56), px(40), px(56), px(40))
+            }
+            annTypeTv = TextView(this).apply {
+                tag = "anntype"; textSize = sp(16f); setTextColor(Color.parseColor("#FFC107"))
+                gravity = Gravity.CENTER; setPadding(0, 0, 0, px(14))
+            }
+            card.addView(annTypeTv)
+            annTitle = TextView(this).apply {
+                tag = "anntitle"; textSize = sp(22f); setTextColor(Color.WHITE)
+                gravity = Gravity.CENTER; setLineSpacing(0f, 1.25f); setPadding(0, 0, 0, px(16))
+            }
+            card.addView(annTitle)
+            annBody = TextView(this).apply {
+                tag = "annbody"; textSize = sp(15f); setTextColor(Color.parseColor("#D8DEE9"))
+                setBackgroundColor(Color.parseColor("#1C2028"))
+                setPadding(px(24), px(20), px(24), px(20)); setLineSpacing(0f, 1.3f)
+                maxLines = 8; ellipsize = android.text.TextUtils.TruncateAt.END
+                maxHeight = (dm.heightPixels * 0.34f).toInt()
+            }
+            card.addView(annBody)
+            annOkBtn = TextView(this).apply {
+                tag = "annok"; text = "确认关闭"; textSize = sp(18f)
+                setTextColor(Color.WHITE); gravity = Gravity.CENTER
+                setPadding(px(64), px(22), px(64), px(22))
+                isFocusable = true; isFocusableInTouchMode = true
+                background = android.graphics.drawable.StateListDrawable().apply {
+                    addState(intArrayOf(android.R.attr.state_focused),
+                        android.graphics.drawable.ColorDrawable(Color.parseColor("#1B6EF3")))
+                    addState(intArrayOf(),
+                        android.graphics.drawable.ColorDrawable(Color.parseColor("#3A4150")))
+                }
+                setOnClickListener { hideAnnouncement() }
+            }
+            val rowLp = LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+            ).apply { gravity = Gravity.CENTER_HORIZONTAL; topMargin = px(28) }
+            card.addView(annOkBtn, rowLp)
+
+            val cardW = (dm.widthPixels * 0.90f).toInt()
+            mask.addView(card, FrameLayout.LayoutParams(
+                cardW, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER))
+            root.addView(mask, FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+            annOverlay = mask
+        }
+        val typeLabel = when (a.type) {
+            "system" -> "🔔 系统公告"
+            "update" -> "🔄 更新公告"
+            "promo"  -> "🎁 活动公告"
+            else     -> "📢 通知公告"
+        }
+        curAnnId = a.id
+        annTypeTv?.text = typeLabel
+        annTitle?.text  = a.title.ifEmpty { "公告" }
+        annBody?.text   = a.content.ifEmpty { "（无内容）" }
+        annOverlay?.visibility = View.VISIBLE
+        annVisible = true
+        // ★ 三件套之二：主动聚焦（否则遥控器按 OK 不命中）
+        handler.postDelayed({
+            if (annVisible) annOkBtn?.requestFocus()
+        }, 120)
+    }
+
+    private fun hideAnnouncement() {
+        // ★ 去重：记录已读的最大公告 id，同一条不再弹（新公告 id 更大，仍会弹）
+        try {
+            val sp = getSharedPreferences("iptv_main", MODE_PRIVATE)
+            val seen = sp.getInt("ann_seen_id", 0)
+            if (curAnnId > seen) sp.edit().putInt("ann_seen_id", curAnnId).apply()
+        } catch (e: Exception) { }
+        curAnnId = 0
+        annOverlay?.visibility = View.GONE
+        annVisible = false
+        annOkBtn?.clearFocus()                      // 三件套之四：清焦点残留
+        annRetry = 0
+    }
+
+    private fun isAnnDialogVisible(): Boolean = annOverlay?.visibility == View.VISIBLE
+
     /** 新版本提示（自绘浮层，电视全屏主题下 AlertDialog 不可靠） */
     private fun showUpdateDialog(info: AuthApi.UpdateInfo) {
         if (updateOverlay == null) {
+            // ★ 尺寸自适应：原字号/内边距按 TV 写死且卡片宽度无约束，手机竖屏会溢出
+            val dm = resources.displayMetrics
+            val wDp = dm.widthPixels / dm.density
+            val s = when {
+                wDp < 500f -> 0.62f    // 手机竖屏（约 360-430dp 宽）
+                wDp < 760f -> 0.80f    // 手机横屏 / 小平板
+                else       -> 1.00f    // 电视 / 平板横屏（960dp+）保持原样
+            }
+            fun sp(v: Float): Float = v * s
+            fun px(v: Int): Int = (v * s).toInt()
+
             val mask = FrameLayout(this).apply { setBackgroundColor(0xCC000000u.toInt()) }
             val card = LinearLayout(this).apply {
                 orientation = LinearLayout.VERTICAL
                 setBackgroundColor(Color.parseColor("#22262E"))
-                setPadding(64, 48, 64, 48)
+                setPadding(px(64), px(48), px(64), px(48))
             }
             card.addView(TextView(this).apply {
-                text = "发现新版本"; textSize = 24f; setTextColor(Color.WHITE)
-                gravity = Gravity.CENTER; setPadding(0, 0, 0, 12)
+                text = "发现新版本"; textSize = sp(24f); setTextColor(Color.WHITE)
+                gravity = Gravity.CENTER; setPadding(0, 0, 0, px(12))
             })
             card.addView(TextView(this).apply {
-                tag = "ver"; textSize = 40f; setTextColor(Color.parseColor("#4CAF50"))
-                gravity = Gravity.CENTER; setPadding(0, 0, 0, 16)
+                tag = "ver"; textSize = sp(40f); setTextColor(Color.parseColor("#4CAF50"))
+                gravity = Gravity.CENTER; setPadding(0, 0, 0, px(16))
             })
             card.addView(TextView(this).apply {
-                tag = "meta"; textSize = 15f; setTextColor(Color.LTGRAY)
-                gravity = Gravity.CENTER; setLineSpacing(0f, 1.2f); setPadding(0, 0, 0, 24)
+                tag = "meta"; textSize = sp(15f); setTextColor(Color.LTGRAY)
+                gravity = Gravity.CENTER; setLineSpacing(0f, 1.2f); setPadding(0, 0, 0, px(24))
             })
             card.addView(TextView(this).apply {
-                tag = "chg"; textSize = 15f; setTextColor(Color.WHITE)
+                tag = "chg"; textSize = sp(15f); setTextColor(Color.WHITE)
                 setBackgroundColor(Color.parseColor("#1C2028"))
-                setPadding(24, 20, 24, 20); setLineSpacing(0f, 1.25f)
-                maxLines = 8; gravity = Gravity.CENTER
+                setPadding(px(24), px(20), px(24), px(20)); setLineSpacing(0f, 1.25f)
+                // ★ 限行 + 省略 + 高度上限：长 changelog 不再把卡片撑出屏幕
+                maxLines = 6; ellipsize = android.text.TextUtils.TruncateAt.END
+                maxHeight = (dm.heightPixels * 0.34f).toInt()
+                gravity = Gravity.CENTER
             })
-            val row = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL; gravity = Gravity.CENTER; setPadding(0, 28, 0, 0) }
+            val row = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL; gravity = Gravity.CENTER; setPadding(0, px(28), 0, 0) }
             fun mkBtn(label: String, focusable: Boolean, onClick: () -> Unit): TextView =
                 TextView(this).apply {
-                    text = label; textSize = 18f; setTextColor(Color.WHITE); gravity = Gravity.CENTER
-                    setPadding(56, 22, 56, 22); isFocusable = focusable; isFocusableInTouchMode = focusable
+                    text = label; textSize = sp(18f); setTextColor(Color.WHITE); gravity = Gravity.CENTER
+                    setPadding(px(56), px(22), px(56), px(22)); isFocusable = focusable; isFocusableInTouchMode = focusable
                     if (focusable) background = android.graphics.drawable.StateListDrawable().apply {
                         addState(intArrayOf(android.R.attr.state_focused),
                             android.graphics.drawable.ColorDrawable(Color.parseColor("#1B6EF3")))
@@ -1070,17 +1299,20 @@ class MainActivity : Activity() {
                     } else setBackgroundColor(Color.parseColor("#2A2F3A"))
                     setOnClickListener { onClick() }
                 }
-            val laterBtn = mkBtn("稍后", true) { hideUpdateDialog() }
-            val dlBtn = mkBtn("立即更新", false) {
+            // ★ 两个按钮都必须可聚焦，否则遥控器永远选不到「立即更新」
+            val laterBtn = mkBtn("稍后", true) { hideUpdateDialog() }.apply { tag = "later" }
+            val dlBtn = mkBtn("立即更新", true) {
                 pendingUpdate?.let { startUpdateDownload(it) }; hideUpdateDialog()
-            }
+            }.apply { tag = "dl" }
             row.addView(laterBtn, LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { rightMargin = 32 })
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { rightMargin = px(32) })
             row.addView(dlBtn, LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT))
             card.addView(row)
+            // ★ 卡片宽度 = 屏幕 90%（左右各留 5%），任何屏幕都不会溢出
+            val cardW = (dm.widthPixels * 0.90f).toInt()
             mask.addView(card, FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER))
+                cardW, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER))
             root.addView(mask, FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
             updateOverlay = mask
@@ -1095,12 +1327,48 @@ class MainActivity : Activity() {
         meta.text = "当前 v${AuthApi.clientVersion(this)}" + (if (mb.isNotEmpty()) "  ·  $mb" else "") +
                 (if (force) "\n⚠ 请升级到此版本" else "")
         chg.text = info.changelog.ifEmpty { "本次更新包含功能优化与问题修复" }
+
+        // ★ 强制更新时不给「稍后」（原代码只写了注释没实现）
+        val laterB = updateOverlay!!.findViewWithTag<TextView>("later")
+        val dlB = updateOverlay!!.findViewWithTag<TextView>("dl")
+        updForce = info.updateRequired || (info.minClientVersion.isNotEmpty() &&
+                compareVersion(AuthApi.clientVersion(this), info.minClientVersion) < 0)
+        laterB?.visibility = if (updForce) View.GONE else View.VISIBLE
+        // 可见的按钮列表（强制更新时只剩「立即更新」）
+        updBtns = arrayOf(if (updForce) null else laterB, dlB)
+        updFocusIdx = if (updForce) 1 else 1   // 默认聚焦「立即更新」（主操作）
+
         updateOverlay!!.visibility = View.VISIBLE
-        // 强制更新时不给"稍后"
-        updateOverlay!!.findViewWithTag<TextView>("ver") // touch to ensure rendered
+        // ★ 必须主动聚焦，否则遥控器按 OK 不会命中任何按钮
+        handler.postDelayed({
+            if (updateOverlay?.visibility == View.VISIBLE) {
+                updBtns.getOrNull(updFocusIdx)?.requestFocus()
+            }
+        }, 120)
     }
 
-    private fun hideUpdateDialog() { updateOverlay?.visibility = View.GONE }
+    private fun hideUpdateDialog() {
+        updateOverlay?.visibility = View.GONE
+        // 清掉焦点，避免残留焦点挡住后续按键
+        updBtns.forEach { it?.clearFocus() }
+        updFocusIdx = 0
+    }
+
+    /** 更新弹窗内切换按钮焦点（遥控器左右/上下） */
+    private fun moveUpdateFocus(delta: Int) {
+        val visible = updBtns.filterNotNull().filter { it.visibility == View.VISIBLE }
+        if (visible.isEmpty()) return
+        val cur = updBtns.getOrNull(updFocusIdx)
+        var i = visible.indexOf(cur)
+        if (i < 0) i = 0
+        i = (i + delta + visible.size) % visible.size
+        val target = visible[i]
+        updFocusIdx = updBtns.indexOf(target)
+        target.requestFocus()
+    }
+
+    /** 更新弹窗是否显示 */
+    private fun isUpdateDialogVisible(): Boolean = updateOverlay?.visibility == View.VISIBLE
 
     /** 比较 "9.10.0" vs "9.3.0" 之类 */
     fun compareVersion(a: String, b: String): Int {
@@ -1242,10 +1510,12 @@ class MainActivity : Activity() {
                 isVip = true
                 trialText.visibility = View.GONE
                 showAuthButton(false)
+                showAuthState(true)          // 右下角显示「✓ 已授权」
                 handler.removeCallbacks(uiTick)
             } else if (!nowVip && isVip) {
                 // ★ 设置页里撤销了授权 → 回到免费模式（倒计时 + 立即授权按钮都恢复）
                 isVip = false
+                showAuthState(false)         // 右下角标识隐藏
                 enterFreeMode()
             }
         }
@@ -1276,6 +1546,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()
+            }
+        }
     }
 
     /** 点「继续播放」→ 重新连接当前频道（直播流最稳的恢复方式） */

app/src/main/java/com/iptv807/tv/SettingsActivity.kt

@@ -197,6 +197,21 @@ class SettingsActivity : Activity() {
 
         val actBtn = mkAction("激活") { doActivate(cardInput.text.toString().trim()) }
         root.addView(actBtn, LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 24 })
+
+        // ===== ★ 售后联系方式（授权无效 / 卡密用不了时能找到人）=====
+        root.addView(TextView(this).apply {
+            text = "⚠ 授权无效、卡密激活不了？\n售后微信：q3970260761"
+            textSize = 16f
+            setTextColor(Color.parseColor("#FFC107"))          // 橙色醒目
+            gravity = Gravity.CENTER
+            setLineSpacing(0f, 1.3f)
+            setPadding(24, 18, 24, 18)
+            isFocusable = true
+            isFocusableInTouchMode = true
+            background = focusBg(normal = 0xFF2E2510.toInt())  // 橙底，聚焦变蓝
+            setOnClickListener { copyWechat() }
+        }, LinearLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 40 })
 
         if (isVip) {
@@ -214,7 +229,44 @@ 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) { }
+    }
+
+    /** 复制售后微信号（TV 上也会 Toast 出来便于手抄） */
+    private fun copyWechat() {
+        val wx = "q3970260761"
+        try {
+            val cm = getSystemService(android.content.Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+            cm.setPrimaryClip(android.content.ClipData.newPlainText("wechat", wx))
+            android.widget.Toast.makeText(this, "微信号已复制：$wx", android.widget.Toast.LENGTH_SHORT).show()
+        } catch (e: Exception) {
+            android.widget.Toast.makeText(this, "售后微信：$wx", android.widget.Toast.LENGTH_SHORT).show()
         }
     }
 
@@ -259,7 +311,7 @@ class SettingsActivity : Activity() {
                 statusText.text = if (r.ok) {
                     "✓ 激活成功！\n${if (r.isPermanent) "永久有效" else "有效期至：${r.expireTime}"}\n卡号：$key"
                 } else {
-                    "✗ 激活失败：${r.message}\n请检查卡密是否正确 / 是否已被使用"
+                    "✗ 激活失败：${r.message}\n请检查卡密是否正确 / 是否已被使用\n\n售后微信：q3970260761（可点下方橙色条复制）"
                 }
                 android.widget.Toast.makeText(this@SettingsActivity,
                     if (r.ok) "激活成功" else "激活失败：${r.message}",

app/src/main/java/com/iptv807/tv/TrialExpiredActivity.kt

@@ -48,16 +48,40 @@ class TrialExpiredActivity : Activity() {
             gravity = android.view.Gravity.CENTER; setPadding(0, 0, 0, 56)
         })
 
-        root.addView(Button(this).apply {
-            text = "购买套餐（OK键）"
-            textSize = 19f
-            setOnClickListener { startActivity(android.content.Intent(this@TrialExpiredActivity, ShopActivity::class.java)); finish() }
-        })
+        // ★ 可聚焦按钮 + 遥控器高亮（原来 Button 无人聚焦，遥控器按 OK 没反应）
+        fun focusableBtn(label: String, size: Float, onClick: () -> Unit) =
+            Button(this).apply {
+                text = label; textSize = size
+                isFocusable = true; isFocusableInTouchMode = true
+                setTextColor(0xFFFFFFFFu.toInt())
+                background = android.graphics.drawable.StateListDrawable().apply {
+                    addState(intArrayOf(android.R.attr.state_focused),
+                        android.graphics.drawable.ColorDrawable(0xFF1B6EF3.toInt()))
+                    addState(intArrayOf(),
+                        android.graphics.drawable.ColorDrawable(0xFF2A2F3A.toInt()))
+                }
+                setPadding(48, 26, 48, 26)
+                setOnClickListener { onClick() }
+            }
+
+        val buyBtn = focusableBtn("购买套餐（OK 键）", 19f) {
+            try {
+                startActivity(android.content.Intent(this@TrialExpiredActivity, ShopActivity::class.java))
+            } catch (e: Exception) { }
+            finish()
+        }
+        root.addView(buyBtn, LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 20 })
+
+        // ★ 新增：明确的关闭入口（原来只能靠按 BACK，而 BACK 走的是系统默认）
+        val closeBtn = focusableBtn("关闭（返回键也可以）", 17f) { finish() }
+        root.addView(closeBtn, LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 8 })
 
         root.addView(TextView(this).apply {
             text = "或直接访问：http://app.88531.cn:8881/#/shop"
             textSize = 13f; setTextColor(0xFF888888u.toInt())
-            gravity = android.view.Gravity.CENTER; setPadding(0, 32, 0, 0)
+            gravity = android.view.Gravity.CENTER; setPadding(0, 28, 0, 0)
         })
 
         root.addView(TextView(this).apply {
@@ -65,6 +89,15 @@ class TrialExpiredActivity : Activity() {
             textSize = 14f; setTextColor(0xFF7799AAu.toInt())
             gravity = android.view.Gravity.CENTER; setPadding(0, 24, 0, 0)
         })
+
+        // 默认聚焦「购买套餐」，遥控器 OK 直接可按；左右/上下在两个按钮间切换
+        buyBtn.post { buyBtn.requestFocus() }
+    }
+
+    /** ★ 返回键显式处理（原来没有，走系统默认，用户不知道能关） */
+    override fun onKeyDown(keyCode: Int, event: android.view.KeyEvent?): Boolean {
+        if (keyCode == android.view.KeyEvent.KEYCODE_BACK) { finish(); return true }
+        return super.onKeyDown(keyCode, event)
     }
 
     private fun openShop() {