Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c35ecec2b | ||
|
|
74ef196ee5 | ||
|
|
7a608a1ba3 | ||
|
|
92d497886e | ||
|
|
231ee78ac2 |
No files matched your search
@@ -6,3 +6,7 @@ local.properties
|
||||
!apk/*.apk
|
||||
tools/
|
||||
notes.txt
|
||||
keystore.properties
|
||||
*.jks
|
||||
*.keystore
|
||||
*.aab
|
||||
@@ -4,6 +4,7 @@
|
||||
<p><b>港澳台 55 个频道,装上就能看,遥控器一点就换台</b></p>
|
||||
<p>
|
||||
<a href="https://github.com/personal82555/gangao-tv/releases/latest"><img src="https://img.shields.io/badge/下载-APK-1B6EF3?style=for-the-badge" alt="下载"></a>
|
||||
<a href="https://t.me/+7YVPMu9EOChkYmM1"><img src="https://img.shields.io/badge/Telegram-加入交流群-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram"></a>
|
||||
<img src="https://img.shields.io/badge/Android-5.0%2B-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android 5.0+">
|
||||
<img src="https://img.shields.io/badge/平台-Android%20TV%20%7C%20电视盒子%20%7C%20手机-555?style=for-the-badge" alt="平台">
|
||||
</p>
|
||||
@@ -57,6 +58,24 @@
|
||||
- 包名:`com.iptv807.tv` | 支持 Android 5.0 及以上 | 横屏
|
||||
- TV 桌面会自动出现横幅图标(Leanback)
|
||||
|
||||
## 💬 加入交流群
|
||||
|
||||
有问题、有建议、想第一时间拿到新版本,欢迎进群里聊。
|
||||
|
||||
**👉 [点此加入 Telegram 交流群](https://t.me/+7YVPMu9EOChkYmM1)**
|
||||
|
||||
群里能拿到这些:
|
||||
|
||||
| | 好处 |
|
||||
|---|---|
|
||||
| 📢 | **新版本第一时间通知** —— 版本推送发布后群内同步提醒,不用天天来盯 GitHub Releases |
|
||||
| 🔧 | **装不上 / 播不出来直接问** —— 带上电视型号和屏幕上的报错文字,通常几分钟就能定位 |
|
||||
| 📡 | **频道与线路问题互通** —— 哪个台挂了、哪条线更稳,大家互相同步,修得更快 |
|
||||
| 💡 | **功能建议真的会被采纳** —— 数字键换台、选中高亮、收藏置顶、开机自启,这些都来自群里的反馈 |
|
||||
| 🎁 | **内测机会** —— 新版本上线前优先发到群里试用 |
|
||||
|
||||
> 进群免费,不发广告;遇到问题先看群公告,多数都能自查解决。
|
||||
|
||||
## 💳 会员与激活
|
||||
|
||||
- **免费**:未激活也能看,每天 1 小时
|
||||
|
||||
+22
-2
@@ -1,8 +1,16 @@
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
id("org.jetbrains.kotlin.android")
|
||||
}
|
||||
|
||||
// release 签名:从仓库根的 keystore.properties 读取(该文件已 .gitignore,缺失时不影响 debug 构建)
|
||||
val ksProps = Properties().apply {
|
||||
val f = rootProject.file("keystore.properties")
|
||||
if (f.exists()) f.inputStream().use { load(it) }
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.iptv807.tv"
|
||||
compileSdk = 35
|
||||
@@ -11,13 +19,25 @@ android {
|
||||
applicationId = "com.iptv807.tv"
|
||||
minSdk = 21
|
||||
targetSdk = 35
|
||||
versionCode = 930
|
||||
versionName = "9.3.0"
|
||||
versionCode = 942
|
||||
versionName = "9.4.2"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
if (ksProps.isNotEmpty()) {
|
||||
create("release") {
|
||||
storeFile = rootProject.file(ksProps.getProperty("storeFile", ""))
|
||||
storePassword = ksProps.getProperty("storePassword")
|
||||
keyAlias = ksProps.getProperty("keyAlias")
|
||||
keyPassword = ksProps.getProperty("keyPassword")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
isMinifyEnabled = false
|
||||
signingConfig = signingConfigs.findByName("release")
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,6 +97,13 @@ class MainActivity : Activity() {
|
||||
private var downT = 0L
|
||||
private var exitHint: TextView? = null
|
||||
private var confirmOverlay: View? = null
|
||||
/** 右上角「立即授权」按钮(未授权时显示) */
|
||||
private var authBtn: TextView? = null
|
||||
/** 右下角「已授权」小字标识(已授权时显示,未授权隐藏) */
|
||||
private var authStateText: TextView? = null
|
||||
/** 首次启动简易教程遮罩 */
|
||||
private var tutorialOverlay: View? = null
|
||||
private var tutorialVisible = false
|
||||
// 安装统计 + 版本推送
|
||||
private var updateOverlay: View? = null
|
||||
private var pendingUpdate: AuthApi.UpdateInfo? = null
|
||||
@@ -178,18 +185,53 @@ class MainActivity : Activity() {
|
||||
root.addView(statusText, FrameLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT))
|
||||
|
||||
// 4) 右上:免费时长 + 模式
|
||||
val rightCol = LinearLayout(this).apply { orientation = LinearLayout.VERTICAL }
|
||||
// 4) 右上:免费时长 + 模式 + 【立即授权】按钮(横排,按钮在倒计时右边)
|
||||
val rightCol = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL }
|
||||
trialText = TextView(this).apply {
|
||||
textSize = 14f; setTextColor(Color.WHITE)
|
||||
setBackgroundColor(0x88000000u.toInt())
|
||||
setPadding(20, 10, 20, 10)
|
||||
}
|
||||
rightCol.addView(trialText)
|
||||
|
||||
authBtn = TextView(this).apply {
|
||||
text = "🔑 立即授权"
|
||||
textSize = 14f
|
||||
setTextColor(Color.WHITE)
|
||||
setBackgroundColor(0xFF1B6EF3.toInt())
|
||||
setPadding(26, 10, 26, 10)
|
||||
isFocusable = true
|
||||
isFocusableInTouchMode = true
|
||||
visibility = View.GONE // 授权成功后隐藏
|
||||
// 遥控器聚焦高亮:蓝底加白框
|
||||
val pad = (4 * resources.displayMetrics.density).toInt()
|
||||
setOnFocusChangeListener { v, has ->
|
||||
v.setBackgroundColor(if (has) 0xFF3D8BFF.toInt() else 0xFF1B6EF3.toInt())
|
||||
v.setPadding(26, 10, 26, 10)
|
||||
if (has) v.alpha = 1f else v.alpha = 0.95f
|
||||
}
|
||||
setOnClickListener { openAuthPage() }
|
||||
}
|
||||
rightCol.addView(authBtn, LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { leftMargin = 8 })
|
||||
val rcLP = FrameLayout.LayoutParams(
|
||||
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)
|
||||
@@ -203,8 +245,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))
|
||||
@@ -280,6 +323,8 @@ class MainActivity : Activity() {
|
||||
// 启动后预取默认频道的相邻频道(很轻量,1 个一个来)
|
||||
handler.postDelayed({ schedulePrefetch(channels.getOrNull(defIdx)) }, 2000)
|
||||
}
|
||||
// 新安装首次打开 → 简易使用教程(可关闭,只弹一次)
|
||||
maybeShowTutorial()
|
||||
}
|
||||
|
||||
private fun setMode(m: Int) { mode = m }
|
||||
@@ -319,17 +364,161 @@ 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" } else enterFreeMode()
|
||||
if (r.ok) {
|
||||
trialText.visibility = View.GONE; trialText.text = "VIP"
|
||||
showAuthButton(false)
|
||||
showAuthState(true) // 右下角显示「✓ 已授权」
|
||||
} else enterFreeMode()
|
||||
}
|
||||
}.start()
|
||||
}
|
||||
|
||||
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 {
|
||||
val b = authBtn ?: return@runOnUiThread
|
||||
b.visibility = if (show) View.VISIBLE else View.GONE
|
||||
if (show) {
|
||||
// 首次出现时自动聚焦,遥控器按 OK 直接进授权页
|
||||
b.postDelayed({
|
||||
if (b.visibility == View.VISIBLE && !isPanelVisible() && tutorialOverlay?.visibility != View.VISIBLE) {
|
||||
b.requestFocus()
|
||||
}
|
||||
}, 600)
|
||||
} else {
|
||||
b.clearFocus()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 菜单键/其他入口统一打开设置页;带三重诊断,打不开时屏幕上有原因 */
|
||||
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 {
|
||||
if (getSharedPreferences("iptv_main", MODE_PRIVATE).getBoolean("tutorial_done", false)) return
|
||||
|
||||
val mask = FrameLayout(this).apply {
|
||||
setBackgroundColor(0xE6000000.toInt())
|
||||
isClickable = true // 挡住底层点击
|
||||
}
|
||||
val card = LinearLayout(this).apply {
|
||||
orientation = LinearLayout.VERTICAL
|
||||
setBackgroundColor(0xFF161B26.toInt())
|
||||
setPadding(64, 48, 64, 56)
|
||||
}
|
||||
card.addView(TextView(this).apply {
|
||||
text = "📺 欢迎使用「港澳台直播」"
|
||||
textSize = 24f; setTextColor(Color.WHITE); setPadding(0, 0, 0, 6)
|
||||
})
|
||||
card.addView(TextView(this).apply {
|
||||
text = "花 30 秒知道怎么用,功能一个不少"
|
||||
textSize = 14f; setTextColor(0xFF93A1B8.toInt()); setPadding(0, 0, 0, 26)
|
||||
})
|
||||
|
||||
val steps = listOf(
|
||||
"1️⃣ 按遥控器 OK 键 → 打开选台面板",
|
||||
"2️⃣ 上下键选频道(选中行蓝底高亮),左右键切换香港 / 澳门 / 台湾分组",
|
||||
"3️⃣ 直接按数字键 → 快速跳到对应频道(按 9 就是 9 号台)",
|
||||
"4️⃣ 菜单键 → 收藏 / 取消收藏当前频道",
|
||||
"5️⃣ 连滑两次 或 按返回键 → 退出应用(都会先弹确认框)",
|
||||
"6️⃣ 断线自动重连、10 条线路自动切换,画面卡住点「▶ 继续播放」即可"
|
||||
)
|
||||
for (t in steps) {
|
||||
card.addView(TextView(this).apply {
|
||||
text = t; textSize = 16f; setTextColor(0xFFE6ECF7.toInt())
|
||||
setLineSpacing(0f, 1.35f); setPadding(0, 9, 0, 9)
|
||||
})
|
||||
}
|
||||
|
||||
val okBtn = android.widget.Button(this).apply {
|
||||
text = "知道了,开始观看"
|
||||
textSize = 17f
|
||||
isFocusable = true; isFocusableInTouchMode = true
|
||||
setBackgroundColor(0xFF1B6EF3.toInt())
|
||||
setTextColor(Color.WHITE)
|
||||
setOnClickListener { closeTutorial() }
|
||||
}
|
||||
card.addView(okBtn, LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { topMargin = 34 })
|
||||
|
||||
val scroll = android.widget.ScrollView(this).apply {
|
||||
setBackgroundColor(Color.TRANSPARENT)
|
||||
isFillViewport = true
|
||||
addView(card)
|
||||
}
|
||||
mask.addView(scroll, FrameLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER
|
||||
).apply { setMargins(260, 90, 260, 90) })
|
||||
|
||||
root.addView(mask, FrameLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
|
||||
tutorialOverlay = mask
|
||||
tutorialVisible = true
|
||||
okBtn.post { okBtn.requestFocus() } // 遥控器 OK 直接关闭
|
||||
} catch (e: Exception) {
|
||||
// 教程失败不能影响正常播放
|
||||
tutorialVisible = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 关闭教程并记住(之后不再显示) */
|
||||
private fun closeTutorial() {
|
||||
tutorialVisible = false
|
||||
try {
|
||||
getSharedPreferences("iptv_main", MODE_PRIVATE).edit().putBoolean("tutorial_done", true).apply()
|
||||
} catch (e: Exception) { }
|
||||
root.removeView(tutorialOverlay)
|
||||
tutorialOverlay = null
|
||||
}
|
||||
|
||||
private fun onUiTick() {
|
||||
if (isVip) return
|
||||
// 每秒累计一次免费用量,这样右上角倒计时才会真正走动
|
||||
@@ -439,8 +628,7 @@ class MainActivity : Activity() {
|
||||
setItemsCanFocus(false)
|
||||
onItemClickListener = AdapterView.OnItemClickListener { _, _, pos, _ ->
|
||||
if (pos == 0) {
|
||||
startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
|
||||
hidePanel(); return@OnItemClickListener
|
||||
openSettingsPage(); hidePanel(); return@OnItemClickListener
|
||||
}
|
||||
if (pos == 0) return@OnItemClickListener
|
||||
curGroupPos = pos - 1
|
||||
@@ -679,11 +867,33 @@ class MainActivity : Activity() {
|
||||
}
|
||||
|
||||
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
|
||||
// 首次教程显示时:返回/OK 都可关闭
|
||||
if (tutorialVisible) {
|
||||
if (keyCode == KeyEvent.KEYCODE_BACK ||
|
||||
keyCode == KeyEvent.KEYCODE_DPAD_CENTER ||
|
||||
keyCode == KeyEvent.KEYCODE_ENTER) {
|
||||
closeTutorial(); return true
|
||||
}
|
||||
return true
|
||||
}
|
||||
// 退出确认框显示时:返回=取消,其余交给按钮焦点系统处理(左右切换,OK 确认)
|
||||
if (confirmVisible) {
|
||||
if (keyCode == KeyEvent.KEYCODE_BACK) { hideExitConfirm(); return true }
|
||||
return super.onKeyDown(keyCode, event)
|
||||
}
|
||||
// 右上角「立即授权」按钮聚焦时:OK 进授权页,返回取消聚焦,方向键清焦点后继续正常换台
|
||||
if (authBtn?.visibility == View.VISIBLE && authBtn?.isFocused == true) {
|
||||
when (keyCode) {
|
||||
KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_NUMPAD_ENTER -> {
|
||||
openAuthPage(); return true
|
||||
}
|
||||
KeyEvent.KEYCODE_BACK -> { authBtn?.clearFocus(); return true }
|
||||
KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN,
|
||||
KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT -> {
|
||||
authBtn?.clearFocus() // 不 return:落到下面正常换台/开面板逻辑
|
||||
}
|
||||
}
|
||||
}
|
||||
// 「继续播放」按钮可见时,遥控 OK/确认 直接触发
|
||||
if (resumeBtn?.visibility == View.VISIBLE &&
|
||||
(keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER ||
|
||||
@@ -748,7 +958,10 @@ class MainActivity : Activity() {
|
||||
KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_NUMPAD_ENTER -> {
|
||||
if (panelCol == 0) {
|
||||
val np = groupAdapter?.selected ?: 0
|
||||
if (np == 0) { startActivity(Intent(this, SettingsActivity::class.java)); hidePanel() }
|
||||
if (np == 0) {
|
||||
openSettingsPage() // 统一走带诊断的入口
|
||||
hidePanel()
|
||||
}
|
||||
else { curGroupPos = np - 1; updateChannelListOfGroup(curGroupPos); panelCol = 1; refreshPanelHighlight() }
|
||||
} else {
|
||||
val pos = channelAdapter?.selected ?: -1
|
||||
@@ -761,7 +974,11 @@ class MainActivity : Activity() {
|
||||
}
|
||||
|
||||
when (keyCode) {
|
||||
KeyEvent.KEYCODE_MENU -> { autoSwitchLine(); return true }
|
||||
// ★ 修复:返回键必须弹退出确认,绝不直接 finish(原来漏了这个分支,
|
||||
// 导致 BACK 落到 super.onKeyDown() = 系统默认无提示退出)
|
||||
KeyEvent.KEYCODE_BACK -> { exitApp(); 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 -> {
|
||||
@@ -1066,7 +1283,14 @@ class MainActivity : Activity() {
|
||||
if (nowVip && (card.isNotEmpty() || !isVip)) {
|
||||
isVip = true
|
||||
trialText.visibility = View.GONE
|
||||
showAuthButton(false)
|
||||
showAuthState(true) // 右下角显示「✓ 已授权」
|
||||
handler.removeCallbacks(uiTick)
|
||||
} else if (!nowVip && isVip) {
|
||||
// ★ 设置页里撤销了授权 → 回到免费模式(倒计时 + 立即授权按钮都恢复)
|
||||
isVip = false
|
||||
showAuthState(false) // 右下角标识隐藏
|
||||
enterFreeMode()
|
||||
}
|
||||
}
|
||||
// 从桌面/设置返回:先尝试续播,失败则显示「继续播放」按钮
|
||||
@@ -1096,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()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 点「继续播放」→ 重新连接当前频道(直播流最稳的恢复方式) */
|
||||
|
||||
@@ -203,15 +203,64 @@ class SettingsActivity : Activity() {
|
||||
root.addView(TextView(this).apply {
|
||||
text = "✓ 已经是会员"
|
||||
textSize = 18f; setTextColor(Color.parseColor("#4CAF50"))
|
||||
gravity = Gravity.CENTER; setPadding(0, 24, 0, 24)
|
||||
gravity = Gravity.CENTER; setPadding(0, 24, 0, 12)
|
||||
})
|
||||
// ★ 新增:撤销本机授权(换机 / 换卡密前先解绑)
|
||||
val revokeBtn = mkAction("撤销本机授权(可重新激活 / 换卡密)") { doRevoke() }
|
||||
root.addView(revokeBtn, LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { bottomMargin = 20 })
|
||||
} else {
|
||||
val btn = mkAction("支付成为会员(月/季/年)") {
|
||||
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) { }
|
||||
}
|
||||
|
||||
/** 撤销本机授权:清除本地授权信息 → 恢复免费模式,可重新输入卡密或换机 */
|
||||
private fun doRevoke() {
|
||||
try {
|
||||
getSharedPreferences("iptv_license", MODE_PRIVATE).edit()
|
||||
.putBoolean("is_vip", false)
|
||||
.putString("card_key", "")
|
||||
.putString("vip_expire", "")
|
||||
.putBoolean("is_permanent", false)
|
||||
.remove("token")
|
||||
.apply()
|
||||
} catch (e: Exception) { }
|
||||
statusText.text = "✓ 已撤销本机授权\n当前为免费用户(每天 1 小时)\n可在下方重新输入卡密激活"
|
||||
android.widget.Toast.makeText(this, "已撤销授权,可重新激活", android.widget.Toast.LENGTH_LONG).show()
|
||||
// 重开本页以刷新界面状态(会员按钮 ↔ 支付按钮)
|
||||
try {
|
||||
startActivity(Intent(this@SettingsActivity, SettingsActivity::class.java))
|
||||
finish()
|
||||
} catch (e: Exception) { }
|
||||
}
|
||||
|
||||
/** 输入卡密激活 */
|
||||
|
||||
Reference in new issue
Block a user