support tvg-chno

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,22 +57,6 @@ 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: |

HISTORY.md

@@ -1,5 +1,9 @@
 ## 更新日誌
 
+### v1.3.9.3
+
+* 支持m3u設置tvg-chno
+
 ### v1.3.9.2
 
 * 優化手機上遠程配置

README.md

@@ -31,7 +31,7 @@
 * m3u
     ```
     #EXTM3U x-tvg-url=""
-    #EXTINF:-1 tvg-id="" tvg-name="標準標題" tvg-logo="图标" group-title="組名",標題
+    #EXTINF:-1 tvg-id="" tvg-chno="" tvg-name="標準標題" tvg-logo="图标" group-title="組名",標題
     #EXTVLCOPT:http-user-agent=
     #EXTVLCOPT:http-referrer=
     視頻地址
@@ -44,6 +44,7 @@
         "name": "標準標題",
         "title": "標題",
         "logo": "图标",
+        "number": "頻道號",
         "uris": [
           "視頻地址"
         ],
@@ -86,6 +87,12 @@ adb install my-tv-0.apk
 * 支持回看
 * 淺色菜單
 
+## 常見問題
+
+* 為什麼遠程配置視頻源文本後，再次打開應用後又恢復到原來的配置？
+
+  如果“應用啟動后更新視頻源”開啟後，且存在視頻源地址，則會自動更新，可能會覆蓋已保存的視頻源文本。
+
 ## 讚賞
 
 ![image](./screenshots/appreciate.png)

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
@@ -60,14 +61,17 @@ class ChannelFragment : Fragment() {
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
         if (_binding != null) {
-            binding.content.text = (tvViewModel.tv.id.plus(1)).toString()
+            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
         }
@@ -78,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)
@@ -102,6 +107,7 @@ class ChannelFragment : Fragment() {
 
     private val hideRunnable = Runnable {
         if (_binding != null) {
+            Log.i(TAG, "channel num zero")
             binding.content.text = BLANK
         }
 
@@ -110,8 +116,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/ImageHelper.kt

@@ -54,7 +54,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
         }
 

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

@@ -614,6 +614,11 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
+        if (channelFragment.isAdded && !channelFragment.isHidden) {
+            channelFragment.hideSelf()
+            return
+        }
+
         if (doubleBackToExitPressedOnce) {
             super.onBackPressed()
             return

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

@@ -84,7 +84,7 @@ class MainViewModel : ViewModel() {
             SP.configUrl?.let {
                 if (it.startsWith("http")) {
                     viewModelScope.launch {
-                        Log.i(TAG, "updateConfig $it")
+                        Log.i(TAG, "update config url: $it")
                         importFromUrl(it)
                         updateEPG()
                     }
@@ -117,12 +117,13 @@ class MainViewModel : ViewModel() {
         cacheChannels = getCache()
 
         if (cacheChannels.isEmpty()) {
+            Log.i(TAG, "cacheChannels isEmpty")
             cacheChannels =
                 context.resources.openRawResource(DEFAULT_CHANNELS_FILE).bufferedReader()
                     .use { it.readText() }
         }
 
-        Log.i(TAG, "cacheChannels $cacheChannels")
+        Log.i(TAG, "cacheChannels $cacheFile $cacheChannels")
 
         try {
             str2Channels(cacheChannels)
@@ -344,7 +345,9 @@ class MainViewModel : ViewModel() {
     fun tryStr2Channels(str: String, file: File?, url: String, id: String = "") {
         try {
             if (str2Channels(str)) {
+                Log.i(TAG, "write to cacheFile $cacheFile $str")
                 cacheFile!!.writeText(str)
+                Log.i(TAG, "cacheFile ${getCache()}")
                 cacheChannels = str
                 if (url.isNotEmpty()) {
                     SP.configUrl = url
@@ -358,11 +361,13 @@ class MainViewModel : ViewModel() {
                 }
                 _channelsOk.value = true
                 R.string.channel_import_success.showToast()
+                Log.i(TAG, "channel import success")
             } else {
                 R.string.channel_import_error.showToast()
+                Log.w(TAG, "channel import error")
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(TAG, "tryStr2Channels", e)
             file?.deleteOnExit()
             R.string.channel_read_error.showToast()
         }
@@ -407,6 +412,7 @@ class MainViewModel : ViewModel() {
                 val lines = string.lines()
                 val nameRegex = Regex("""tvg-name="([^"]+)"""")
                 val logRegex = Regex("""tvg-logo="([^"]+)"""")
+                val numRegex = Regex("""tvg-chno="([^"]+)"""")
                 val epgRegex = Regex("""x-tvg-url="([^"]+)"""")
                 val groupRegex = Regex("""group-title="([^"]+)"""")
 
@@ -422,7 +428,6 @@ class MainViewModel : ViewModel() {
                     if (trimmedLine.startsWith("#EXTM3U")) {
                         epgUrl = epgRegex.find(trimmedLine)?.groupValues?.get(1)?.trim()
                     } else if (trimmedLine.startsWith("#EXTINF")) {
-                        Log.i(TAG, "TV $tv")
                         val key = tv.group + tv.name
                         if (key.isNotEmpty()) {
                             tvMap[key] =
@@ -434,6 +439,8 @@ class MainViewModel : ViewModel() {
                         var name = nameRegex.find(info.first())?.groupValues?.get(1)?.trim()
                         tv.name = if (name.isNullOrEmpty()) tv.title else name
                         tv.logo = logRegex.find(info.first())?.groupValues?.get(1)?.trim() ?: ""
+                        tv.number =
+                            numRegex.find(info.first())?.groupValues?.get(1)?.trim()?.toInt() ?: -1
                         tv.group = groupRegex.find(info.first())?.groupValues?.get(1)?.trim() ?: ""
                     } else if (trimmedLine.startsWith("#EXTVLCOPT:http-")) {
                         val keyValue =
@@ -476,6 +483,7 @@ class MainViewModel : ViewModel() {
                         t0.headers,
                         t0.group,
                         SourceType.UNKNOWN,
+                        t0.number,
                         emptyList(),
                     )
                     l.add(t1)
@@ -525,12 +533,14 @@ class MainViewModel : ViewModel() {
                         emptyMap(),
                         channelGroup,
                         SourceType.UNKNOWN,
+                        -1,
                         emptyList(),
                     )
 
                     l.add(tv)
                 }
                 list = l
+                Log.d(TAG, "导入频道 $list")
                 Log.i(TAG, "导入频道 ${list.size}")
             }
         }
@@ -565,6 +575,10 @@ class MainViewModel : ViewModel() {
 
         listModel = listModelNew
 
+        for (ii in listModel) {
+            Log.d(TAG, "${ii.tv.title} ${ii.tv.number}")
+        }
+
         // 全部频道
         groupModel.tvGroupValue[1].setTVListModel(listModel)
 

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

@@ -61,10 +61,10 @@ object SP {
     private const val KEY_SOFT_DECODE = "soft_decode"
 
     const val DEFAULT_CHANNEL_REVERSAL = false
-    const val DEFAULT_CONFIG_URL = ""
     const val DEFAULT_CHANNEL_NUM = false
     const val DEFAULT_TIME = true
     const val DEFAULT_BOOT_STARTUP = false
+    const val DEFAULT_CONFIG_URL = ""
     const val DEFAULT_PROXY = ""
     const val DEFAULT_EPG =
         "https://live.fanmingming.cn/e.xml,https://raw.githubusercontent.com/fanmingming/live/main/e.xml"

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

@@ -43,11 +43,11 @@ class SimpleServer(private val context: Context, private val viewModel: MainView
         return when (session.uri) {
             "/api/settings" -> handleSettings()
             "/api/sources" -> handleSources()
-            "/api/import-text" -> handleImportFromText(session)
-            "/api/import-uri" -> handleImportFromUri(session)
+            "/api/import-text" -> handleImportText(session)
+            "/api/import-uri" -> handleImportUri(session)
             "/api/proxy" -> handleProxy(session)
             "/api/epg" -> handleEPG(session)
-            "/api/channel" -> handleDefaultChannel(session)
+            "/api/default-channel" -> handleDefaultChannel(session)
             "/api/remove-source" -> handleRemoveSource(session)
             else -> handleStaticContent()
         }
@@ -96,7 +96,6 @@ class SimpleServer(private val context: Context, private val viewModel: MainView
                 e.message
             )
         }
-
         return newFixedLengthResponse(Response.Status.OK, "application/json", response)
     }
 
@@ -141,7 +140,7 @@ class SimpleServer(private val context: Context, private val viewModel: MainView
         )
     }
 
-    private fun handleImportFromText(session: IHTTPSession): Response {
+    private fun handleImportText(session: IHTTPSession): Response {
         R.string.start_config_channel.showToast()
         val response = ""
         try {
@@ -151,7 +150,7 @@ class SimpleServer(private val context: Context, private val viewModel: MainView
                 }
             }
         } catch (e: Exception) {
-            Log.e(TAG, "handleImportFromText", e)
+            Log.e(TAG, "handleImportText", e)
             return newFixedLengthResponse(
                 Response.Status.INTERNAL_ERROR,
                 MIME_PLAINTEXT,
@@ -161,7 +160,7 @@ class SimpleServer(private val context: Context, private val viewModel: MainView
         return newFixedLengthResponse(Response.Status.OK, "text/plain", response)
     }
 
-    private fun handleImportFromUri(session: IHTTPSession): Response {
+    private fun handleImportUri(session: IHTTPSession): Response {
         R.string.start_config_channel.showToast()
         val response = ""
         try {
@@ -173,7 +172,7 @@ class SimpleServer(private val context: Context, private val viewModel: MainView
                 }
             }
         } catch (e: Exception) {
-            Log.e(TAG, "handleImportFromUri", e)
+            Log.e(TAG, "handleImportUri", e)
             return newFixedLengthResponse(
                 Response.Status.INTERNAL_ERROR,
                 MIME_PLAINTEXT,

app/src/main/java/com/lizongying/mytv0/data/TV.kt

@@ -14,6 +14,7 @@ data class TV(
     var headers: Map<String, String>? = null,
     var group: String = "",
     var sourceType: SourceType = SourceType.UNKNOWN,
+    var number: Int = -1,
     var child: List<TV> = emptyList(),
 ) : Serializable {
 
@@ -29,6 +30,7 @@ data class TV(
                 ", headers=" + headers +
                 ", group='" + group + '\'' +
                 ", sourceType='" + sourceType + '\'' +
+                ", number=" + number +
                 '}'
     }
 }