fix ysp

lizongying · May 31, 2024 · cf8d7f0 · cf8d7f0
1 parent bcfca9e
commit cf8d7f0
Show file tree

Hide file tree

Showing 17 changed files with 328 additions and 336 deletions.
diff --git a/HISTORY.md b/HISTORY.md
diff --git a/README.md b/README.md
@@ -35,7 +35,6 @@
 * 亮度调节
 * 音量调节
 * 軟解
-* 网格空白处退出
 
 ## 版权说明
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,6 +26,7 @@ android {
             cmake {
                 arguments "-DIS_SO_BUILD=${project.hasProperty('IS_SO_BUILD') ? project.IS_SO_BUILD : true}"
 
+//                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
                 abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
@@ -128,6 +129,7 @@ dependencies {
 
     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'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

diff --git a/app/src/main/cpp/arm64-v8a/libnative.so b/app/src/main/cpp/arm64-v8a/libnative.so
diff --git a/app/src/main/cpp/armeabi-v7a/libnative.so b/app/src/main/cpp/armeabi-v7a/libnative.so
diff --git a/app/src/main/cpp/x86/libcrypto.a b/app/src/main/cpp/x86/libcrypto.a
diff --git a/app/src/main/cpp/x86/libcrypto.so b/app/src/main/cpp/x86/libcrypto.so
diff --git a/app/src/main/cpp/x86/libssl.a b/app/src/main/cpp/x86/libssl.a
diff --git a/app/src/main/cpp/x86/libssl.so b/app/src/main/cpp/x86/libssl.so
diff --git a/app/src/main/cpp/x86_64/libcrypto.a b/app/src/main/cpp/x86_64/libcrypto.a
diff --git a/app/src/main/cpp/x86_64/libcrypto.so b/app/src/main/cpp/x86_64/libcrypto.so
diff --git a/app/src/main/cpp/x86_64/libssl.a b/app/src/main/cpp/x86_64/libssl.a
diff --git a/app/src/main/cpp/x86_64/libssl.so b/app/src/main/cpp/x86_64/libssl.so
diff --git a/app/src/main/java/com/lizongying/mytv/UpdateManager.kt b/app/src/main/java/com/lizongying/mytv/UpdateManager.kt
@@ -1,26 +1,17 @@
 package com.lizongying.mytv
 
-import android.app.DownloadManager
-import android.app.DownloadManager.Request
-import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.database.Cursor
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import androidx.fragment.app.FragmentActivity
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.workDataOf
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.requests.ReleaseRequest
 import com.lizongying.mytv.requests.ReleaseResponse
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.io.File
 
 
 class UpdateManager(
@@ -32,17 +23,15 @@ class UpdateManager(
     private var releaseRequest = ReleaseRequest()
     private var release: ReleaseResponse? = null
 
-    private var downloadReceiver: DownloadReceiver? = null
-
     fun checkAndUpdate() {
         CoroutineScope(Dispatchers.Main).launch {
             var text = "版本获取失败"
             var update = false
             try {
                 release = releaseRequest.getRelease()
-                Log.i(TAG, "versionCode $versionCode ${release?.version_code}")
-                if (release?.version_code != null) {
-                    if (release?.version_code!! > versionCode) {
+                val code = release?.version_code
+                if (code != null) {
+                    if (code.toLong() > versionCode) {
                         text = "最新版本：${release?.version_name}"
                         update = true
                     } else {
@@ -61,170 +50,24 @@ class UpdateManager(
         dialog.show((context as FragmentActivity).supportFragmentManager, TAG)
     }
 
-    private fun startDownload(release: ReleaseResponse) {
+    private fun startDownload(context: Context, release: ReleaseResponse) {
+        val versionName = release.version_name
         val apkName = "my-tv"
         val apkFileName = "$apkName-${release.version_name}.apk"
-        val downloadManager =
-            context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request =
-            Request(Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk"))
-        Log.i(
-            TAG,
-            "url ${Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk")}"
-        )
-        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
-        Log.i(TAG, "save dir ${Environment.DIRECTORY_DOWNLOADS}")
-        request.setDestinationInExternalFilesDir(
-            context,
-            Environment.DIRECTORY_DOWNLOADS,
-            apkFileName
-        )
-        request.setTitle("${context.resources.getString(R.string.app_name)} ${release.version_name}")
-        request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setAllowedOverRoaming(false)
-        request.setMimeType("application/vnd.android.package-archive")
-
-        // 获取下载任务的引用
-        val downloadReference = downloadManager.enqueue(request)
-
-        downloadReceiver = DownloadReceiver(context, apkFileName, downloadReference)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.registerReceiver(
-                downloadReceiver,
-                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
-                Context.RECEIVER_NOT_EXPORTED,
-            )
-        } else {
-            context.registerReceiver(
-                downloadReceiver,
-                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+        val downloadUrl =
+            "${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk"
+        Log.i(TAG, "downloadUrl: $downloadUrl")
+        val downloadRequest = OneTimeWorkRequestBuilder<UpdateWorker>()
+            .setInputData(
+                workDataOf(
+                    "VERSION_NAME" to versionName,
+                    "APK_FILENAME" to apkFileName,
+                    "DOWNLOAD_URL" to downloadUrl
+                )
             )
-        }
+            .build()
 
-        getDownloadProgress(context, downloadReference) { progress ->
-            println("Download progress: $progress%")
-        }
-    }
-
-    private fun getDownloadProgress(
-        context: Context,
-        downloadId: Long,
-        progressListener: (Int) -> Unit
-    ) {
-        val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val handler = Handler(Looper.getMainLooper())
-        val intervalMillis: Long = 1000
-
-        handler.post(object : Runnable {
-            override fun run() {
-                Log.i(TAG, "search")
-                val query = DownloadManager.Query().setFilterById(downloadId)
-                val cursor: Cursor = downloadManager.query(query)
-                cursor.use {
-                    if (it.moveToFirst()) {
-                        val bytesDownloadedIndex =
-                            it.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-                        val bytesTotalIndex =
-                            it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-
-                        // 检查列名是否存在
-                        if (bytesDownloadedIndex != -1 && bytesTotalIndex != -1) {
-                            val bytesDownloaded = it.getInt(bytesDownloadedIndex)
-                            val bytesTotal = it.getInt(bytesTotalIndex)
-
-                            if (bytesTotal != -1) {
-                                val progress = (bytesDownloaded * 100L / bytesTotal).toInt()
-                                progressListener(progress)
-                                if (progress == 100) {
-                                    return
-                                }
-                            }
-                        }
-                    }
-                }
-
-//                handler.postDelayed(this, intervalMillis)
-            }
-        })
-    }
-
-    private class DownloadReceiver(
-        private val context: Context,
-        private val apkFileName: String,
-        private val downloadReference: Long
-    ) : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val reference = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            Log.i(TAG, "reference $reference")
-
-            if (reference == downloadReference) {
-                val downloadManager =
-                    context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-                val query = DownloadManager.Query().setFilterById(downloadReference)
-                val cursor = downloadManager.query(query)
-                if (cursor != null && cursor.moveToFirst()) {
-                    val statusIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
-                    if (statusIndex < 0) {
-                        Log.i(TAG, "Download failure")
-                        return
-                    }
-                    val status = cursor.getInt(statusIndex)
-
-                    val progressIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-                    if (progressIndex < 0) {
-                        Log.i(TAG, "Download failure")
-                        return
-                    }
-                    val progress = cursor.getInt(progressIndex)
-
-                    val totalSizeIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-                    val totalSize = cursor.getInt(totalSizeIndex)
-
-                    cursor.close()
-
-                    when (status) {
-                        DownloadManager.STATUS_SUCCESSFUL -> {
-                            installNewVersion()
-                        }
-
-                        DownloadManager.STATUS_FAILED -> {
-                            // Handle download failure
-                            Log.i(TAG, "Download failure")
-                        }
-
-                        else -> {
-                            // Update UI with download progress
-                            val percentage = progress * 100 / totalSize
-                            Log.i(TAG, "Download progress: $percentage%")
-                        }
-                    }
-                }
-            }
-        }
-
-        private fun installNewVersion() {
-            val apkFile = File(
-                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
-                apkFileName
-            )
-            Log.i(TAG, "apkFile $apkFile")
-
-            if (apkFile.exists()) {
-                val apkUri = Uri.parse("file://$apkFile")
-                Log.i(TAG, "apkUri $apkUri")
-                val installIntent = Intent(Intent.ACTION_VIEW).apply {
-                    setDataAndType(apkUri, "application/vnd.android.package-archive")
-                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-
-                context.startActivity(installIntent)
-            } else {
-                Log.e(TAG, "APK file does not exist!")
-            }
-        }
+        WorkManager.getInstance(context).enqueue(downloadRequest)
     }
 
     companion object {
@@ -233,16 +76,9 @@ class UpdateManager(
 
     override fun onConfirm() {
         Log.i(TAG, "onConfirm $release")
-        release?.let { startDownload(it) }
+        release?.let { startDownload(context, it) }
     }
 
     override fun onCancel() {
     }
-
-    fun destroy() {
-        if (downloadReceiver != null) {
-            context.unregisterReceiver(downloadReceiver)
-            Log.i(TAG, "destroy downloadReceiver")
-        }
-    }
 }