support kitkat

vrichv · Jul 12, 2024 · b28ad4f · b28ad4f
1 parent 25d4e88
commit b28ad4f
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 38 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
-/build
+/build
+/release
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId = "com.lizongying.mytv0"
-        minSdk = 21
+        minSdk = 19
         targetSdk = 34
         versionCode = getVersionCode()
         versionName = getVersionName()
@@ -82,7 +82,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.nanohttpd)
     implementation(libs.gua64)

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
diff --git a/app/src/main/java/com/lizongying/mytv0/MainActivity.kt b/app/src/main/java/com/lizongying/mytv0/MainActivity.kt
@@ -65,8 +65,16 @@ class MainActivity : FragmentActivity() {
             }
         }
 
-        window.statusBarColor = Color.TRANSPARENT
-        window.navigationBarColor = Color.TRANSPARENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.statusBarColor = Color.TRANSPARENT
+                window.navigationBarColor = Color.TRANSPARENT
+            }
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             window.navigationBarDividerColor = Color.TRANSPARENT
         }

diff --git a/app/src/main/java/com/lizongying/mytv0/Utils.kt b/app/src/main/java/com/lizongying/mytv0/Utils.kt
@@ -58,7 +58,7 @@ object Utils {
             try {
                 client.newCall(request).execute().use { response ->
                     if (!response.isSuccessful) throw IOException("Unexpected code $response")
-                    val string = response.body?.string()
+                    val string = response.body()?.string()
                     Gson().fromJson(string, TimeResponse::class.java).data.t.toLong()
                 }
             } catch (e: IOException) {

diff --git a/app/src/main/java/com/lizongying/mytv0/models/TVGroupModel.kt b/app/src/main/java/com/lizongying/mytv0/models/TVGroupModel.kt
@@ -41,10 +41,10 @@ class TVGroupModel : ViewModel() {
         _tvGroupModel.value = newList
     }
 
-    fun clear() {
+    fun clear2() {
         _tvGroupModel.value = mutableListOf(getTVListModel(0)!!, getTVListModel(1)!!)
         setPosition(0)
-        getTVListModel(1)?.clear()
+        getTVListModel(1)?.clear2()
     }
 
     fun getTVListModel(): TVListModel? {

diff --git a/app/src/main/java/com/lizongying/mytv0/models/TVList.kt b/app/src/main/java/com/lizongying/mytv0/models/TVList.kt
@@ -80,7 +80,7 @@ object TVList {
             val response = HttpClient.okHttpClient.newCall(request).execute()
 
             if (response.isSuccessful) {
-                val epg = EPGXmlParser().parse(response.body!!.byteStream())
+                val epg = EPGXmlParser().parse(response.body()!!.byteStream())
 
                 withContext(Dispatchers.Main) {
                     for (m in listModel) {
@@ -90,7 +90,7 @@ object TVList {
                 }
                 "EPG获取成功".showToast()
             } else {
-                Log.e("", "request status ${response.code}")
+                Log.e("", "request status ${response.code()}")
                 "EPG状态错误".showToast()
             }
         } catch (e: Exception) {
@@ -111,7 +111,7 @@ object TVList {
                     if (!file.exists()) {
                         file.createNewFile()
                     }
-                    val str = response.body!!.string()
+                    val str = response.body()!!.string()
                     withContext(Dispatchers.Main) {
                         if (str2List(str)) {
                             file.writeText(str)
@@ -128,7 +128,7 @@ object TVList {
                         }
                     }
                 } else {
-                    Log.e("", "request status ${response.code}")
+                    Log.e("", "request status ${response.code()}")
                     "频道状态错误".showToast()
                 }
             } catch (e: JsonSyntaxException) {
@@ -279,7 +279,7 @@ object TVList {
             }
         }
 
-        groupModel.clear()
+        groupModel.clear2()
 
         val map: MutableMap<String, MutableList<TVModel>> = mutableMapOf()
         for (v in list) {

diff --git a/app/src/main/java/com/lizongying/mytv0/models/TVListModel.kt b/app/src/main/java/com/lizongying/mytv0/models/TVListModel.kt
@@ -82,7 +82,7 @@ class TVListModel(private val name: String, private val index: Int) : ViewModel(
         }
     }
 
-    fun clear() {
+    fun clear2() {
         _tvListModel.value = mutableListOf()
         setPosition(0)
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
 desugar_jdk_libs = "2.0.4"
-media3 = "1.3.1" # 1.3.0: 19 java8  1.2.1: 17 media3-datasource-okhttp:1.2.1:21
+media3 = "1.3.0" # 1.3.0: 19 java8  1.2.1: 17 media3-datasource-okhttp:1.2.1:21
 nanohttpd = "2.3.1"
 gua64 = "1.4.5"
 recyclerview = "1.3.2"
 zxing = "3.5.3"
 glide = "4.16.0" # java7
 
-gson = "2.11.0" # 19:2.10.1
-okhttp = "3.14.9"
-retrofit = "2.11.0" # 21:2.9.0 17:2.6.4
+gson = "2.10.1" # 19:2.10.1
+okhttp = "3.12.13"
+retrofit = "2.6.4" # 21:2.9.0 17:2.6.4
 
 work = "2.9.0"
 core_ktx = "1.13.1"