diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 49739644..ca10c36b 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 30da449a..170ec186 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 512a4a70..3bb6bc5c 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 258a9afd..88177315 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 ecc2aed8..e2acff30 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 966ee72d..b4754d6e 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 c1898bc9..0f46b184 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 00000000..9309b174 Binary files /dev/null and b/app/src/main/res/drawable/cetv1.png differ diff --git a/app/src/main/res/raw/channels.json b/app/src/main/res/raw/channels.json index 9bc48afe..a19fc49a 100644 --- a/app/src/main/res/raw/channels.json +++ b/app/src/main/res/raw/channels.json @@ -863,7 +863,7 @@ { "id": 56, "videoIndex": 0, - "channel": "国际频道", + "channel": "国际", "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp", "pid": "600014550", "sid": "2001656803", @@ -878,7 +878,7 @@ { "id": 57, "videoIndex": 0, - "channel": "国际频道", + "channel": "国际", "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp", "pid": "600084704", "sid": "2010153503", @@ -893,7 +893,7 @@ { "id": 58, "videoIndex": 0, - "channel": "国际频道", + "channel": "国际", "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp", "pid": "600084758", "sid": "2010152603", @@ -908,7 +908,7 @@ { "id": 59, "videoIndex": 0, - "channel": "国际频道", + "channel": "国际", "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp", "pid": "600084782", "sid": "2010155203", @@ -923,7 +923,7 @@ { "id": 60, "videoIndex": 0, - "channel": "国际频道", + "channel": "国际", "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp", "pid": "600084744", "sid": "2010152503", @@ -939,7 +939,7 @@ { "id": 61, "videoIndex": 0, - "channel": "国际频道", + "channel": "国际", "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp", "pid": "600084781", "sid": "2010155403",