update source after the reset

lizongying · Aug 4, 2024 · be53488 · be53488
1 parent cbbaf81
commit be53488
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 53 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 ## 更新日志
 
+### v1.3.1
+
+* 恢復默認後，立即更新視頻源
+
 ### v1.3.0
 
 * 修復收藏BUG

diff --git a/README.md b/README.md
@@ -80,6 +80,9 @@ adb install my-tv-0.apk
 * 支持回看
 * 詳細EPG
 * 淺色菜單
+* 是否顯示全部頻道
+* 固定網絡配置端口
+* 無效的頻道？
 
 ## 讚賞
 

diff --git a/app/src/main/java/com/lizongying/mytv0/SP.kt b/app/src/main/java/com/lizongying/mytv0/SP.kt
@@ -39,6 +39,9 @@ object SP {
 
     private const val KEY_EPG = "epg"
 
+    const val DEFAULT_CONFIG_URL = "https://live.fanmingming.com/tv/m3u/itv.m3u"
+    const val DEFAULT_CHANNEL = 1
+
     private lateinit var sp: SharedPreferences
 
     /**
@@ -84,16 +87,15 @@ object SP {
         set(value) = sp.edit().putBoolean(KEY_REPEAT_INFO, value).apply()
 
     var config: String?
-        get() = sp.getString(KEY_CONFIG,
-            "")
+        get() = sp.getString(KEY_CONFIG, DEFAULT_CONFIG_URL)
         set(value) = sp.edit().putString(KEY_CONFIG, value).apply()
 
     var configAutoLoad: Boolean
         get() = sp.getBoolean(KEY_CONFIG_AUTO_LOAD, false)
         set(value) = sp.edit().putBoolean(KEY_CONFIG_AUTO_LOAD, value).apply()
 
     var channel: Int
-        get() = sp.getInt(KEY_CHANNEL, 0)
+        get() = sp.getInt(KEY_CHANNEL, DEFAULT_CHANNEL)
         set(value) = sp.edit().putInt(KEY_CHANNEL, value).apply()
 
     var defaultLike: Boolean

diff --git a/app/src/main/java/com/lizongying/mytv0/SettingFragment.kt b/app/src/main/java/com/lizongying/mytv0/SettingFragment.kt
@@ -6,7 +6,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -18,6 +17,8 @@ import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv0.databinding.SettingBinding
 import com.lizongying.mytv0.models.TVList
+import kotlin.math.max
+import kotlin.math.min
 
 
 class SettingFragment : Fragment() {
@@ -107,49 +108,14 @@ class SettingFragment : Fragment() {
             (activity as MainActivity).settingActive()
         }
 
-        val config = binding.config
-        config.text = SP.config?.let { Editable.Factory.getInstance().newEditable(it) }
-            ?: Editable.Factory.getInstance().newEditable("")
+        confirmConfig()
         binding.confirmConfig.setOnClickListener {
-            var url = config.text.toString().trim()
-            url = Utils.formatUrl(url)
-            uri = Uri.parse(url)
-            Log.i(TAG, "uri.scheme ${uri.scheme}")
-            if (uri.scheme == "") {
-                uri = uri.buildUpon().scheme("http").build()
-            }
-            Log.i(TAG, "Uri $uri")
-            if (uri.isAbsolute) {
-                Log.i(TAG, "Uri ok")
-                if (uri.scheme == "file") {
-                    requestReadPermissions()
-                } else {
-                    TVList.parseUri(uri)
-                }
-            } else {
-                config.error = "无效的地址"
-            }
-            (activity as MainActivity).settingActive()
+            confirmConfig()
         }
 
-        val defaultChannel = binding.channel
-        defaultChannel.text =
-            SP.channel.let { Editable.Factory.getInstance().newEditable(it.toString()) }
-                ?: Editable.Factory.getInstance().newEditable("")
+        confirmChannel()
         binding.confirmChannel.setOnClickListener {
-            val c = defaultChannel.text.toString().trim()
-            var channel = 0
-            try {
-                channel = c.toInt()
-            } catch (e: NumberFormatException) {
-                println(e)
-            }
-            if (channel > 0 && channel <= TVList.listModel.size) {
-                SP.channel = channel
-            } else {
-                defaultChannel.error = "无效的频道"
-            }
-            (activity as MainActivity).settingActive()
+            confirmChannel()
         }
 
         val defaultProxy = binding.proxy
@@ -174,10 +140,10 @@ class SettingFragment : Fragment() {
         }
 
         binding.clear.setOnClickListener {
-            SP.config = ""
-            config.text = Editable.Factory.getInstance().newEditable("")
-            SP.channel = 0
-            defaultChannel.text = Editable.Factory.getInstance().newEditable("")
+            SP.config = SP.DEFAULT_CONFIG_URL
+            confirmConfig()
+            SP.channel = SP.DEFAULT_CHANNEL
+            confirmChannel()
             context.deleteFile(TVList.FILE_NAME)
             SP.deleteLike()
             SP.position = 0
@@ -324,6 +290,40 @@ class SettingFragment : Fragment() {
         return binding.root
     }
 
+    private fun confirmConfig() {
+        val config = binding.config
+        config.text = SP.config?.let { Editable.Factory.getInstance().newEditable(it) }
+            ?: Editable.Factory.getInstance().newEditable(SP.DEFAULT_CONFIG_URL)
+
+        var url = config.text.toString().trim()
+        url = Utils.formatUrl(url)
+        uri = Uri.parse(url)
+        if (uri.scheme == "") {
+            uri = uri.buildUpon().scheme("http").build()
+        }
+        if (uri.isAbsolute) {
+            if (uri.scheme == "file") {
+                requestReadPermissions()
+            } else {
+                TVList.parseUri(uri)
+            }
+        } else {
+            config.error = "无效的地址"
+        }
+        (activity as MainActivity).settingActive()
+    }
+
+    private fun confirmChannel() {
+        val defaultChannel = binding.channel
+        SP.channel = min(max(SP.channel, 1), TVList.listModel.size)
+
+        defaultChannel.text =
+            Editable.Factory.getInstance()
+                .newEditable(SP.channel.toString())
+
+        (activity as MainActivity).settingActive()
+    }
+
     fun setServer(server: String) {
         binding.server.text = "http://$server"
     }

diff --git a/app/src/main/java/com/lizongying/mytv0/models/TVList.kt b/app/src/main/java/com/lizongying/mytv0/models/TVList.kt
@@ -58,10 +58,6 @@ object TVList {
             Toast.makeText(context, "读取频道失败，请在菜单中进行设置", Toast.LENGTH_LONG).show()
         }
 
-        if (SP.config.isNullOrEmpty()) {
-            SP.config = "https://live.fanmingming.com/tv/m3u/itv.m3u"
-        }
-
         if (SP.configAutoLoad) {
             SP.config?.let {
                 update(it)

diff --git a/app/src/main/res/raw/channels.txt b/app/src/main/res/raw/channels.txt
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"version_code": 16973824, "version_name": "v1.3.0"}
+{"version_code": 16974080, "version_name": "v1.3.1"}