remove LocaleContextWrapper

lizongying · Oct 17, 2024 · b3567d9 · b3567d9
1 parent 3919384
commit b3567d9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -6,6 +6,10 @@
 * 修復獲取時間錯誤問題
 * 可以直接配置视频源文本
 
+### v1.3.7.19
+
+* 解决重复启动的问题
+
 ### v1.3.7.18
 
 * 解決EPG和proxy無法置空的問題
@@ -24,11 +28,6 @@
 * 修復無法配置的問題
 * 修復配置頁面默認EPG不顯示的問題
 
-### v1.3.7.15
-
-* 修復無法配置的問題
-* 修復配置頁面默認EPG不顯示的問題
-
 ### v1.3.7.14
 
 * 在遠程配置二維碼基礎上加入文字

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -170,5 +170,7 @@ dependencies {
 
     implementation(files("libs/lib-decoder-ffmpeg-release.aar"))
 
+    implementation(libs.multidex)
+
     implementation(libs.conscrypt)
 }
diff --git a/app/src/main/java/com/lizongying/mytv0/MyTVApplication.kt b/app/src/main/java/com/lizongying/mytv0/MyTVApplication.kt
@@ -3,6 +3,7 @@ package com.lizongying.mytv0
 import android.content.Context
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.util.DisplayMetrics

diff --git a/app/src/main/java/com/lizongying/mytv0/PlayerFragment.kt b/app/src/main/java/com/lizongying/mytv0/PlayerFragment.kt
@@ -23,8 +23,8 @@ import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.mediacodec.MediaCodecSelector
 import androidx.media3.exoplayer.mediacodec.MediaCodecUtil
-import com.lizongying.mytv0.databinding.PlayerBinding
 import com.lizongying.mytv0.data.SourceType
+import com.lizongying.mytv0.databinding.PlayerBinding
 import com.lizongying.mytv0.models.TVModel
 
 

diff --git a/app/src/main/java/com/lizongying/mytv0/models/TVGroupModel.kt b/app/src/main/java/com/lizongying/mytv0/models/TVGroupModel.kt
@@ -86,13 +86,13 @@ class TVGroupModel : ViewModel() {
         )
         (_tvGroup.value as List<TVListModel>)[1].initTVList()
     }
-    //API17+: clear() in ViewModel must rename!
-    fun clear2() {
+
+    fun clearData() {
         if (SP.showAllChannels) {
             _tvGroup.value =
                 mutableListOf(getFavoritesList()!!, getAllList()!!)
             setPosition(0)
-            getAllList()?.clear2()
+            getAllList()?.clearData()
         } else {
             _tvGroup.value = mutableListOf(getFavoritesList()!!)
             setPosition(0)

diff --git a/app/src/main/java/com/lizongying/mytv0/models/TVListModel.kt b/app/src/main/java/com/lizongying/mytv0/models/TVListModel.kt
@@ -109,8 +109,8 @@ class TVListModel(private val name: String, private val groupIndex: Int) : ViewM
     fun initTVList() {
         _tvList.value = mutableListOf()
     }
-    //API17+: clear() in ViewModel must rename!
-    fun clear2() {
+
+    fun clearData() {
         initTVList()
         setPosition(0)
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,6 +21,8 @@ android-gradle-plugin = "8.3.2"
 kotlin-android = "2.0.0"
 appcompat = "1.6.1" #api17+: 1.6.1
 
+multidex = "2.0.1"
+
 conscrypt = "2.5.2" #api17+
 
 [libraries]
@@ -51,6 +53,8 @@ recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "r
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "core_ktx" }
 lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 
+multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+
 #api17+
 conscrypt = { module = "org.conscrypt:conscrypt-android", version.ref = "conscrypt" }