fix black screen

HISTORY.md

@@ -1,5 +1,9 @@
 ## 更新日誌
 
+### v2.1.4
+
+* 解決切換頻道時黑屏問題
+
 ### v2.1.1
 
 * 平衡聲音

app/build.gradle

@@ -98,71 +98,26 @@ static def VersionName() {
     }
 }
 
-def gson_version = "2.10.1"
-def failureaccess_version = "1.0.2"
-def guava_version = "33.2.1-android"
-
 dependencies {
-
-//    minSdk17
-    def media3_version = "1.2.1"
-
-    implementation "androidx.media3:media3-ui:$media3_version"
-
-    // For media playback using ExoPlayer
-    implementation("com.google.guava:failureaccess:$failureaccess_version")
-    implementation("com.google.guava:guava:$guava_version")
-    implementation("androidx.media3:media3-common:$media3_version") {
-        exclude group: 'com.google.guava', module: 'guava'
-        exclude group: 'com.google.guava', module: 'failureaccess'
-    }
-    implementation("androidx.media3:media3-exoplayer:$media3_version")
-
-    // For HLS playback support with ExoPlayer
-    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
-
-    // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
-
-    implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
-    // Gson 2.10.1 and older: API level 19
-    implementation("com.google.code.gson:gson:$gson_version")
-    implementation("com.squareup.retrofit2:converter-gson:$retrofit2_version") {
-        exclude group: 'com.google.code.gson', module: 'gson'
-    }
-    implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
-
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-    implementation 'androidx.core:core-ktx:1.11.0-beta02'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.leanback:leanback:1.2.0-alpha02'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
-
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-}
-
-configurations.configureEach {
-    resolutionStrategy {
-        force("com.google.code.gson:gson:$gson_version")
-        force "com.google.guava:failureaccess:$failureaccess_version"
-        force "com.google.guava:guava:$guava_version"
-        eachDependency { details ->
-            if (details.requested.group == 'com.google.code.gson') {
-                details.useVersion "$gson_version"
-            }
-            if (details.requested.group == 'com.google.guava' && details.requested.name == 'failureaccess') {
-                details.useVersion "$failureaccess_version"
-            }
-            if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') {
-                details.useVersion "$guava_version"
-            }
-        }
-    }
+    implementation(libs.media3.ui)
+    implementation(libs.failureaccess)
+    implementation(libs.guava)
+    implementation(libs.media3.common)
+    implementation(libs.media3.exoplayer)
+    implementation(libs.media3.exoplayer.hls)
+    implementation(libs.protobuf.kotlin)
+    implementation(libs.gson)
+    implementation(libs.converter.gson)
+    implementation(libs.converter.protobuf)
+    implementation(libs.retrofit)
+    implementation(libs.glide)
+    implementation(libs.work.runtime.ktx)
+    implementation(libs.core.ktx)
+    implementation(libs.multidex)
+    implementation(libs.leanback)
+    implementation(libs.lifecycle.runtime.ktx)
+    implementation(libs.constraintlayout)
+    implementation(libs.serialization.json)
+    implementation(libs.coroutines.android)
+    implementation(libs.javax.annotation.api)
 }

app/src/main/java/com/lizongying/mytv/ConfirmationFragment.kt

@@ -3,13 +3,37 @@ package com.lizongying.mytv
 import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import com.lizongying.mytv.databinding.ConfirmationBinding
 
 class ConfirmationFragment(
     private val listener: ConfirmationListener,
     private val message: String,
     private val update: Boolean
 ) : DialogFragment() {
+//
+//    private var _binding: ConfirmationBinding? = null
+//    private val binding get() = _binding!!
+//
+//    override fun onCreateView(
+//        inflater: LayoutInflater, container: ViewGroup?,
+//        savedInstanceState: Bundle?
+//    ): View {
+//        _binding = ConfirmationBinding.inflate(inflater, container, false)
+//        return binding.root
+//    }
+//
+//    fun updateProgress(progress: Int) {
+//        binding.progressBar.progress = progress
+//    }
+//
+//    override fun onDestroyView() {
+//        super.onDestroyView()
+//        _binding = null
+//    }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {

app/src/main/java/com/lizongying/mytv/MyTVApplication.kt

@@ -5,7 +5,10 @@ import android.content.Context
 import android.content.res.Resources
 import android.util.DisplayMetrics
 import android.view.WindowManager
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
 import androidx.multidex.MultiDex
+import com.lizongying.mytv.models.MyViewModel
 
 
 class MyTVApplication : Application() {
@@ -23,6 +26,8 @@ class MyTVApplication : Application() {
     private var density = 2.0f
     private var scale = 1.0f
 
+    lateinit var myViewModel: MyViewModel
+
     override fun onCreate() {
         super.onCreate()
 
@@ -60,6 +65,11 @@ class MyTVApplication : Application() {
 
         deviation = width - Resources.getSystem().displayMetrics.widthPixels
         scale = Resources.getSystem().displayMetrics.scaledDensity
+
+        myViewModel = ViewModelProvider(
+            ViewModelStore(),
+            ViewModelProvider.NewInstanceFactory()
+        )[MyViewModel::class.java]
     }
 
     fun getDisplayMetrics(): DisplayMetrics {

app/src/main/java/com/lizongying/mytv/SettingFragment.kt

@@ -6,11 +6,14 @@ import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.DialogFragment
@@ -159,6 +162,21 @@ class SettingFragment : DialogFragment() {
             requireActivity().finishAffinity()
         }
 
+//        val myViewModel = application.myViewModel
+//        application.myViewModel.downloadProgress.observe(viewLifecycleOwner) { _ ->
+//            val downloadProgress = myViewModel.downloadProgress.value
+//            if (downloadProgress != null) {
+//                if (downloadProgress == 100) {
+//                    binding.progressBar.visibility = GONE
+//                } else {
+//                    if (!binding.progressBar.isVisible) {
+//                        binding.progressBar.visibility = VISIBLE
+//                    }
+//                    binding.progressBar.progress = downloadProgress
+//                }
+//            }
+//        }
+
         updateManager = UpdateManager(context, context.appVersionCode)
 
         return binding.root

app/src/main/java/com/lizongying/mytv/UpdateManager.kt

@@ -31,7 +31,7 @@ class UpdateManager(
                 release = releaseRequest.getRelease()
                 val code = release?.version_code
                 if (code != null) {
-                    if (code.toLong() > versionCode) {
+                    if (code.toLong() >= versionCode) {
                         text = "最新版本：${release?.version_name}"
                         update = true
                     } else {

app/src/main/java/com/lizongying/mytv/UpdateWorker.kt

@@ -13,6 +13,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.FileProvider
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import com.lizongying.mytv.models.MyViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -22,6 +23,8 @@ class UpdateWorker(context: Context, params: WorkerParameters) : CoroutineWorker
     private lateinit var notificationManager: NotificationManager
     private lateinit var notificationBuilder: NotificationCompat.Builder
 
+    private lateinit var myViewModel: MyViewModel
+
     override suspend fun doWork(): Result {
         val downloadUrl = inputData.getString("DOWNLOAD_URL") ?: return Result.failure()
         val apkFileName = inputData.getString("APK_FILENAME") ?: return Result.failure()
@@ -29,6 +32,9 @@ class UpdateWorker(context: Context, params: WorkerParameters) : CoroutineWorker
 
         showNotification(applicationContext)
 
+        val app = applicationContext as MyTVApplication
+        myViewModel = app.myViewModel
+
         return withContext(Dispatchers.IO) {
             try {
                 downloadAndInstall(applicationContext, downloadUrl, apkFileName, versionName)
@@ -96,6 +102,8 @@ class UpdateWorker(context: Context, params: WorkerParameters) : CoroutineWorker
 
                 if (bytesTotal > 0) {
                     val progress = (bytesDownloaded * 100L / bytesTotal).toInt()
+                    Log.i(TAG, "progress $progress")
+//                    myViewModel.setDownloadProgress(progress)
                     notificationBuilder.setProgress(100, progress, false)
                     notificationManager.notify(1, notificationBuilder.build())
                 }

app/src/main/java/com/lizongying/mytv/api/ApiClient.kt

@@ -12,6 +12,8 @@ import okhttp3.TlsVersion
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
+import java.net.InetSocketAddress
+import java.net.Proxy
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
@@ -166,7 +168,7 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-//            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
+            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
 
             val builder = OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)

app/src/main/java/com/lizongying/mytv/models/MyViewModel.kt

@@ -0,0 +1,19 @@
+package com.lizongying.mytv.models
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class MyViewModel : ViewModel() {
+    private var _downloadProgress = MutableLiveData<Int>()
+    val downloadProgress: LiveData<Int>
+        get() = _downloadProgress
+
+    fun setDownloadProgress(progress: Int) {
+        _downloadProgress.value = progress
+    }
+
+    init {
+        _downloadProgress.value = 0
+    }
+}

app/src/main/res/layout/confirmation.xml

@@ -0,0 +1,24 @@
+<!-- res/layout/fragment_progress_dialog.xml -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <Button
+        android:id="@+id/btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/start_update"
+        tools:text="开始更新">
+    </Button>
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0"
+        android:progressDrawable="@android:drawable/progress_horizontal" />
+</LinearLayout>

app/src/main/res/layout/player.xml

@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        app:shutter_background_color="@android:color/transparent"
         app:resize_mode="fill"
         app:use_controller="false" />
 </FrameLayout>

app/src/main/res/layout/setting.xml

@@ -59,6 +59,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
+<!--            <androidx.core.widget.ContentLoadingProgressBar-->
+<!--                android:id="@+id/progressBar"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:indeterminate="false"-->
+<!--                android:max="100"-->
+<!--                android:progress="0"-->
+<!--                android:visibility="gone"-->
+<!--                android:progressDrawable="@android:drawable/progress_horizontal" />-->
             <Button
                 android:id="@+id/clear"
                 android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -8,4 +8,5 @@
     <string name="title_time">显示时间</string>
     <string name="clear">恢复默认</string>
     <string name="exit">退出应用</string>
+    <string name="start_update">开始更新</string>
 </resources>

gradle/libs.versions.toml

@@ -0,0 +1,40 @@
+[versions]
+media3 = "1.2.1" # minSdk17
+gson = "2.10.1" # 2.10.1 and older: API level 19
+failureaccess = "1.0.2"
+guava = "33.2.1-android"
+retrofit = "2.6.4" # 21:2.9.0 17:2.6.4
+protobuf = "3.25.1"
+glide = "4.11.0"
+work = "2.9.0"
+core_ktx = "1.11.0-beta02"
+multidex = "2.0.1"
+leanback = "1.2.0-alpha02"
+lifecycle = "2.6.2"
+constraintlayout = "2.1.4"
+serialization = "1.6.2"
+coroutines = "1.8.0-RC"
+javax_annotation = "1.3.2"
+
+[libraries]
+media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }
+media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
+media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "media3" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+failureaccess = { module = "com.google.guava:failureaccess", version.ref = "failureaccess" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+converter-protobuf = { module = "com.squareup.retrofit2:converter-protobuf", version.ref = "retrofit" }
+protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "core_ktx" }
+multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+leanback = { module = "androidx.leanback:leanback", version.ref = "leanback" }
+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax_annotation" }

version.json

@@ -1 +1 @@
-{"version_code": 33620224, "version_name": "v2.1.1"}
+{"version_code": 33620992, "version_name": "v2.1.4"}