From 558fe7e4e71367c47f95440cd0a51d967fb5bec3 Mon Sep 17 00:00:00 2001 From: Li ZongYing Date: Fri, 8 Mar 2024 21:17:13 +0800 Subject: [PATCH] cetv1 --- .github/ISSUE_TEMPLATE/bug.yml | 4 +-- README.md | 15 ++++++-- app/src/main/AndroidManifest.xml | 3 +- .../java/com/lizongying/mytv/InfoFragment.kt | 4 +++ .../main/java/com/lizongying/mytv/Request.kt | 4 +++ .../main/java/com/lizongying/mytv/TVList.kt | 32 +++++++++++++----- .../main/java/com/lizongying/mytv/api/Info.kt | 1 - app/src/main/res/drawable/cetv1.png | Bin 0 -> 4333 bytes app/src/main/res/raw/channels.json | 12 +++---- 9 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable/cetv1.png diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 4973964..ca10c36 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -19,8 +19,8 @@ body: label: my-ty 版本 description: 请选择正在使用的版本 options: - - 最新稳定版 - - 最新 CI 版 + - 通用版 + - 专用版 validations: required: true - type: textarea diff --git a/README.md b/README.md index 30da449..170ec18 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,17 @@ ## 更新日志 +### v1.6.4（通用） + +* 增加CETV1 +* 增加凤凰卫视 +* 默认关闭开机启动 + +### v1.6.3（安卓5及以上专用） + +* 增加CETV1 +* 默认关闭开机启动 + ### v1.6.2（通用） * 修复按键无效的问题 @@ -200,16 +211,14 @@ adb install my-tv.apk * 音量不同 * 大湾区卫视、广东4k超高清、广东珠江、三沙卫视 -* CETV教育频道 * CHC高清三个电影频道 * 地方频道 * 收藏夹 * 自定义源 -* 凤凰卫视、凤凰资讯台 * 海外 -* 1.5.0 无法安装，1.5.1 可以安装 * 节目增加预告 * 频道列表优化 +* 自动更新 ## 赞赏 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 512a4a7..3bb6bc5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,7 +41,6 @@ + android:exported="false"/> \ No newline at end of file diff --git a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt index 258a9af..8817731 100644 --- a/app/src/main/java/com/lizongying/mytv/InfoFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/InfoFragment.kt @@ -47,6 +47,10 @@ class InfoFragment : Fragment() { .load(R.drawable.bingtuan) .into(binding.infoLogo) + "CETV1" -> Glide.with(this) + .load(R.drawable.cetv1) + .into(binding.infoLogo) + else -> Glide.with(this) .load(tvViewModel.logo.value) .into(binding.infoLogo) diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt index ecc2aed..e2acff3 100644 --- a/app/src/main/java/com/lizongying/mytv/Request.kt +++ b/app/src/main/java/com/lizongying/mytv/Request.kt @@ -54,6 +54,10 @@ class Request { handler.post(tokenRunnable) } + fun onDestroy() { + handler.removeCallbacks(tokenRunnable) + } + fun initYSP(context: Context) { ysp = YSP(context) } diff --git a/app/src/main/java/com/lizongying/mytv/TVList.kt b/app/src/main/java/com/lizongying/mytv/TVList.kt index 966ee72..b4754d6 100644 --- a/app/src/main/java/com/lizongying/mytv/TVList.kt +++ b/app/src/main/java/com/lizongying/mytv/TVList.kt @@ -873,10 +873,24 @@ object TVList { true, mustToken = false ), + TV( + 57, + "CETV1", + "CETV1", + listOf(), + 0, + "地方", + "", + "600171827", + "2022823801", + "", + true, + mustToken = false + ), ), "港澳台" to listOf( TV( - 57, + 58, "凤凰卫视资讯台", "", listOf(), @@ -890,7 +904,7 @@ object TVList { mustToken = false ), TV( - 58, + 59, "凤凰卫视中文台", "", listOf(), @@ -904,7 +918,7 @@ object TVList { mustToken = false ), TV( - 59, + 60, "凤凰卫视香港台", "", listOf(), @@ -920,7 +934,7 @@ object TVList { ), "国际" to listOf( TV( - 60, + 61, "CGTN", "CGTN", listOf("http://live.cgtn.com/1000/prog_index.m3u8"), @@ -934,7 +948,7 @@ object TVList { mustToken = false ), TV( - 61, + 62, "CGTN 法语频道", "CGTN法语频道", listOf("https://livefr.cgtn.com/1000f/prog_index.m3u8"), @@ -948,7 +962,7 @@ object TVList { mustToken = false ), TV( - 62, + 63, "CGTN 俄语频道", "CGTN俄语频道", listOf("http://liveru.cgtn.com/1000r/prog_index.m3u8"), @@ -962,7 +976,7 @@ object TVList { mustToken = false ), TV( - 63, + 64, "CGTN 阿拉伯语频道", "CGTN阿拉伯语频道", listOf("http://livear.cgtn.com/1000a/prog_index.m3u8"), @@ -976,7 +990,7 @@ object TVList { mustToken = false ), TV( - 64, + 65, "CGTN 西班牙语频道", "CGTN西班牙语频道", listOf( @@ -993,7 +1007,7 @@ object TVList { mustToken = false ), TV( - 65, + 66, "CGTN 纪录频道", "CGTN外语纪录频道", listOf("https://livedoc.cgtn.com/500d/prog_index.m3u8"), diff --git a/app/src/main/java/com/lizongying/mytv/api/Info.kt b/app/src/main/java/com/lizongying/mytv/api/Info.kt index c1898bc..0f46b18 100644 --- a/app/src/main/java/com/lizongying/mytv/api/Info.kt +++ b/app/src/main/java/com/lizongying/mytv/api/Info.kt @@ -1,6 +1,5 @@ package com.lizongying.mytv.api - data class Info( val code: Int?, val msg: String?, diff --git a/app/src/main/res/drawable/cetv1.png b/app/src/main/res/drawable/cetv1.png new file mode 100644 index 0000000000000000000000000000000000000000..9309b1747639a359724d1d4f81d7781910aee01f GIT binary patch literal 4333 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