support program list

Author: lizongying

.github/workflows/build.yml

@@ -22,6 +22,22 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
 
+      - name: Run build with Gradle wrapper
+        run: ./gradlew clean && ./gradlew assembleRelease
+
+      - name: Sign app APK
+        id: sign_app
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          alias: ${{ secrets.ALIAS }}
+          signingKeyBase64: ${{ secrets.KEYSTORE }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.ALIAS_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "34.0.0"
+
       - name: Get History
         id: get_history
         run: |
@@ -41,27 +57,11 @@ jobs:
           prerelease: false
           body_path: history.md
 
-      - name: Run build with Gradle wrapper
-        run: ./gradlew clean && ./gradlew assembleRelease
-
-      - name: Sign app APK
-        id: sign_app
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: app/build/outputs/apk/release
-          alias: ${{ secrets.ALIAS }}
-          signingKeyBase64: ${{ secrets.KEYSTORE }}
-          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
-          keyPassword: ${{ secrets.ALIAS_PASSWORD }}
-        env:
-          # override default build-tools version (29.0.3) -- optional
-          BUILD_TOOLS_VERSION: "34.0.0"
-
       - name: Set Asset Name
         id: set_asset_name
         run: |
           VERSION_WITHOUT_V=$(echo '${{ github.ref_name }}' | sed 's/^v//')
-          echo "asset_name=my-tv-0.${VERSION_WITHOUT_V}.apk" >> $GITHUB_ENV
+          echo "asset_name=my-tv-0_${VERSION_WITHOUT_V}.apk" >> $GITHUB_ENV
 
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1

HISTORY.md

@@ -1,5 +1,31 @@
 ## 更新日誌
 
+### v1.3.9.7-kitkat
+
+* 遙控器左鍵/觸屏長按打開節目單
+
+### v1.3.9.7
+
+* 修復無法退出的問題
+* 優化tvg-chno
+
+### v1.3.9.6
+
+* 遙控器左鍵/觸屏長按打開節目單
+
+### v1.3.9.3
+
+* 支持m3u設置tvg-chno
+
+### v1.3.9.2
+
+* 優化手機上遠程配置
+
+### v1.3.9.0
+
+* 支持socks代理
+* 支持m3u設置headers
+
 ### v1.3.8.17-kitkat
 
 * 優化LOGO緩存

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 李宗英
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -8,7 +8,7 @@ gen-version:
 
 #make gen v=1.2.3
 gen:
-	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "v$(v)" "\"}"}' > version.json
+	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "v$(v)" "\", \"apk_name\": \"" "my-tv-0_$(v).apk" "\", \"apk_url\": \"" "https://mirror.ghproxy.com/github.com/lizongying/my-tv-0/releases/download/v$(v)/my-tv-0_$(v).apk" "\"}"}' > version.json
 
 channels:
 	gua64 -f -e files/channels.json -o app/src/main/res/raw/channels.txt

README.md

@@ -6,8 +6,9 @@
 
 ## 使用
 
-* 遙控器左鍵/觸屏單擊打開視頻列表
+* 遙控器中鍵/觸屏單擊打開視頻列表
 * 遙控器右鍵/觸屏雙擊打開配置
+* 遙控器左鍵/觸屏長按打開節目單
 * 遙控器返回鍵關閉視頻列表/配置
 * 在聚焦視頻標題的時候，右鍵收藏/取消收藏
 * 打開配置后，選擇遠程配置，掃描二維碼可以配置視頻源等。也可以直接遠程配置地址 http://0.0.0.0:34567
@@ -17,9 +18,9 @@
 注意：
 
 * 遇到問題可以先考慮重啟/恢復默認/清除數據/重新安裝等方式自助解決
-* 如果APP運行在手機上，建議在其他設備上進行遠程配置
 * 視頻源可以設置為本地文件，格式如：file:///mnt/sdcard/tmp/channels.m3u
   /channels.m3u
+* 目前設置代理後，需要重啟生效。代理屬於全局代理，也就是視頻請求及其他請求都會使用代理。
 
 目前支持的配置格式：
 
@@ -30,18 +31,21 @@
     ```
 * m3u
     ```
-    #EXTM3U
-    #EXTINF:-1 tvg-name="標準標題" tvg-logo="图标" group-title="組名",標題
+    #EXTM3U x-tvg-url=""
+    #EXTINF:-1 tvg-id="" tvg-chno="" tvg-name="標準標題" tvg-logo="图标" group-title="組名",標題
+    #EXTVLCOPT:http-user-agent=
+    #EXTVLCOPT:http-referrer=
     視頻地址
     ```
 * json
     ```json
     [
       {
         "group": "組名",
-        "logo": "图标",
         "name": "標準標題",
         "title": "標題",
+        "logo": "图标",
+        "number": "頻道號",
         "uris": [
           "視頻地址"
         ],
@@ -81,12 +85,13 @@ adb install my-tv-0.apk
 ## TODO
 
 * 支持回看
-* 詳細EPG
 * 淺色菜單
-* 無效的頻道？
-* 如果上次播放頻道不在收藏？
-* 當list為空，顯示group/空group不顯示？
-* 遠程配置使用webView
+
+## 常見問題
+
+* 為什麼遠程配置視頻源文本後，再次打開應用後又恢復到原來的配置？
+
+  如果“應用啟動后更新視頻源”開啟後，且存在視頻源地址，則會自動更新，可能會覆蓋已保存的視頻源文本。
 
 ## 讚賞
 

app/build.gradle.kts

@@ -79,7 +79,7 @@ dependencies {
     implementation(libs.media3.exoplayer.hls)
     implementation(libs.media3.exoplayer.dash)
     implementation(libs.media3.exoplayer.rtsp)
-    //implementation(libs.media3.datasource.okhttp)
+//    implementation(libs.media3.datasource.okhttp)
     implementation(libs.media3.datasource.rtmp)
 
     implementation(libs.nanohttpd)
@@ -89,8 +89,6 @@ dependencies {
 
     implementation(libs.gson)
     implementation(libs.okhttp)
-    implementation(libs.converter.gson)
-    implementation(libs.retrofit)
 
     implementation(libs.core.ktx)
     implementation(libs.coroutines)

app/src/main/java/com/lizongying/mytv0/ChannelFragment.kt

@@ -3,6 +3,7 @@ package com.lizongying.mytv0
 import MainViewModel
 import android.os.Bundle
 import android.os.Handler
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -59,13 +60,18 @@ class ChannelFragment : Fragment() {
     fun show(tvViewModel: TVModel) {
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
-        binding.content.text = (tvViewModel.tv.id.plus(1)).toString()
+        if (_binding != null) {
+            binding.content.text =
+                if (tvViewModel.tv.number == -1) (tvViewModel.tv.id.plus(1)).toString() else tvViewModel.tv.number.toString()
+        }
         view?.visibility = View.VISIBLE
         handler.postDelayed(hideRunnable, delay)
     }
 
     fun show(channel: String) {
-        if (viewModel.groupModel.getCurrent()!!.tv.id > 10 && viewModel.groupModel.getCurrent()!!.tv.id == this.channel - 1) {
+        Log.d(TAG, "input $channel")
+        val tv = viewModel.groupModel.getCurrent()!!.tv
+        if (tv.id > 10 && tv.id == this.channel - 1) {
             this.channel = 0
             channelCount = 0
         }
@@ -76,9 +82,10 @@ class ChannelFragment : Fragment() {
         this.channel = "${this.channel}$channel".toInt()
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
+        Log.d(TAG, "channelCount $channelCount")
+        binding.content.text = this.channel.toString()
+        view?.visibility = View.VISIBLE
         if (channelCount < 3) {
-            binding.content.text = this.channel.toString()
-            view?.visibility = View.VISIBLE
             handler.postDelayed(playRunnable, delay)
         } else {
             handler.postDelayed(playRunnable, 0)
@@ -108,8 +115,16 @@ class ChannelFragment : Fragment() {
         channelCount = 0
     }
 
+    fun hideSelf() {
+        handler.postDelayed(hideRunnable, 0)
+    }
+
     private val playRunnable = Runnable {
-        (activity as MainActivity).play(channel - 1)
+        var c = channel - 1
+        viewModel.listModel.find { it.tv.number == channel }?.let {
+            c = it.tv.id
+        }
+        (activity as MainActivity).play(c)
         handler.postDelayed(hideRunnable, delay)
     }
 

app/src/main/java/com/lizongying/mytv0/Ext.kt

@@ -99,5 +99,5 @@ fun Int.showToast(duration: Int = Toast.LENGTH_SHORT) {
 fun String.md5(): String {
     val md = MessageDigest.getInstance("MD5")
     val digest = md.digest(this.toByteArray())
-    return digest.joinToString("") { String.format("%02x", it) }
+    return digest.joinToString("") { "%02x".format(it) }
 }

app/src/main/java/com/lizongying/mytv0/ImageHelper.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.util.Log
-import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.lizongying.mytv0.requests.HttpClient
 import kotlinx.coroutines.Dispatchers
@@ -38,11 +37,11 @@ class ImageHelper(private val context: Context) {
                 HttpClient.okHttpClient.newCall(request).execute().use { response ->
                     if (!response.isSuccessful) return@withContext false
                     response.bodyAlias()?.byteStream()?.copyTo(file.outputStream())
-                    Log.i(TAG, "downloadImage success $url")
                     true
                 }
             } catch (e: Exception) {
-                Log.e(TAG, "downloadImage", e)
+//                Log.e(TAG, "downloadImage error $url", e)
+                Log.e(TAG, "downloadImage error $url")
                 false
             }
         }
@@ -54,7 +53,7 @@ class ImageHelper(private val context: Context) {
     ) {
         val file = files[key]
         if (file != null) {
-            Log.i(TAG, "image exists ${file.absolutePath}")
+            Log.d(TAG, "image exists ${file.absolutePath}")
             return
         }
 
@@ -66,21 +65,21 @@ class ImageHelper(private val context: Context) {
             val file = File(cacheDir, "$LOGO/$key")
             if (downloadImage(url, file)) {
                 files[file.name] = file
-                Log.i(TAG, "image download success ${file.absolutePath}")
+                Log.d(TAG, "downloadImage success $url ${file.absolutePath}")
                 break
             }
         }
     }
 
     fun loadImage(
         key: String,
-        imageView: ImageView,
+        imageView: androidx.appcompat.widget.AppCompatImageView,
         bitmap: Bitmap,
         url: String,
     ) {
         val file = files[key]
         if (file != null) {
-            Log.i(TAG, "image exists ${file.absolutePath}")
+            Log.i(TAG, "$key image exists ${file.absolutePath}")
             Glide.with(context)
                 .load(file)
                 .fitCenter()
@@ -89,11 +88,13 @@ class ImageHelper(private val context: Context) {
         }
 
         if (url.isEmpty()) {
+            Log.i(TAG, "$key image bitmap")
             Glide.with(context)
                 .load(bitmap)
                 .fitCenter()
                 .into(imageView)
         } else {
+            Log.i(TAG, "$key image $url")
             Glide.with(context)
                 .load(url)
                 .placeholder(BitmapDrawable(context.resources, bitmap))

app/src/main/java/com/lizongying/mytv0/InfoFragment.kt

@@ -77,20 +77,22 @@ class InfoFragment : Fragment() {
             return
         }
 
+        val tv = tvModel.tv
+
         val context = requireContext()
         val application = context.applicationContext as MyTVApplication
         val imageHelper = application.imageHelper
 
-        binding.title.text = tvModel.tv.title
+        binding.title.text = tv.title
 
-        when (tvModel.tv.title) {
+        when (tv.title) {
             else -> {
                 val width = 300
                 val height = 180
                 val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
                 val canvas = Canvas(bitmap)
 
-                val channelNum = tvModel.tv.id + 1
+                val channelNum = if (tv.number == -1) tv.id.plus(1) else tv.number
                 var size = 150f
                 if (channelNum > 99) {
                     size = 100f
@@ -107,13 +109,8 @@ class InfoFragment : Fragment() {
                 val y = height / 2f - (paint.descent() + paint.ascent()) / 2
                 canvas.drawText(channelNum.toString(), x, y, paint)
 
-                val url = tvModel.tv.logo
-                var name = tvModel.tv.name
-                if (name.isEmpty()) {
-                    name = tvModel.tv.title
-                }
-
-                imageHelper.loadImage(name, binding.logo, bitmap, url)
+                val name = if (tv.name.isNotEmpty()) { tv.name } else { tv.title }
+                imageHelper.loadImage(name, binding.logo, bitmap, tv.logo)
             }
         }