Merge pull request #179 from misaka10032w/develop

[Fix] 修复侧边栏在非预期位置打开的问题、修复更新下载进度条卡在0假死的问题

Author: misaka10032w

app/src/main/java/com/yenaly/han1meviewer/logic/network/HUpdater.kt

@@ -81,7 +81,7 @@ object HUpdater {
      *
      * @param url update url
      */
-    suspend fun File.injectUpdate(url: String, progress: (suspend (Int) -> Unit)? = null) {
+    suspend fun File.injectUpdate(url: String, progress: (suspend (Int, Long, Long) -> Unit)? = null) {
         val res = HanimeNetwork.githubService.request(url)
         if (url.endsWith("zip")) {
             Log.d(TAG, "Injecting update from zip ($url)")
@@ -90,7 +90,9 @@ object HUpdater {
                     ZipInputStream(stream).use { zip ->
                         zip.nextEntry
                         this.outputStream().use {
-                            zip.copyTo(it, body.contentLength(), progress = progress)
+                            Log.i(TAG, "content length: ${body.contentLength()}")
+                            // 估摸着压缩率为0.56左右，稍微估算解压后大小，防止进度卡在100%时间过长
+                            zip.copyTo(it, (body.contentLength() * 1.79).toLong(), progress = progress)
                         }
                     }
                 }
@@ -99,6 +101,7 @@ object HUpdater {
             Log.d(TAG, "Injecting update from release ($url)")
             this.outputStream().use {
                 res.body()?.use { body ->
+                    Log.i(TAG, "content length: ${body.contentLength()}")
                     body.byteStream().copyTo(it, body.contentLength(), progress = progress)
                 }
             }

app/src/main/java/com/yenaly/han1meviewer/logic/network/service/HGitHubService.kt

@@ -10,6 +10,7 @@ import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
+import retrofit2.http.Streaming
 import retrofit2.http.Url
 
 /**
@@ -60,6 +61,7 @@ interface HGitHubService {
      * Typical request
      */
     @GET
+    @Streaming
     suspend fun request(
         @Url url: String,
     ): Response<ResponseBody>

app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt

@@ -40,6 +40,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
@@ -171,6 +172,11 @@ class MainActivity : YenalyActivity<ActivityMainBinding>(), DrawerListener, Tool
             if (targetId != null && targetId != currentCheckedId) {
                 binding.nvMain.setCheckedItem(targetId)
             }
+            if (destination.id == R.id.nv_home_page){
+                binding.dlMain.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+            } else {
+                binding.dlMain.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+            }
         }
     }
 

app/src/main/java/com/yenaly/han1meviewer/util/Files.kt

@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import androidx.core.content.FileProvider
 import androidx.core.net.toUri
 import com.yenaly.han1meviewer.FILE_PROVIDER_AUTHORITY
@@ -110,7 +111,7 @@ suspend fun InputStream.copyTo(
     out: OutputStream,
     contentLength: Long,
     bufferSize: Int = DEFAULT_BUFFER_SIZE,
-    progress: (suspend (Int) -> Unit)? = null,
+    progress: (suspend (Int, Long, Long) -> Unit)? = null,
 ): Long {
     return withContext(Dispatchers.IO) {
         this@copyTo.use {
@@ -125,10 +126,11 @@ suspend fun InputStream.copyTo(
                 val newPercent = (bytesCopied * 100 / contentLength).toInt()
                 if (newPercent != percent) {
                     percent = newPercent
-                    progress?.invoke(percent.coerceAtMost(100))
+                    progress?.invoke(percent.coerceAtMost(100), contentLength, bytesCopied)
                 }
                 bytes = read(buffer)
             }
+            Log.i("progress",bytesCopied.toString())
             bytesCopied
         }
     }

app/src/main/java/com/yenaly/han1meviewer/worker/HUpdateWorker.kt

@@ -5,6 +5,7 @@ import android.app.Notification
 import android.content.Context
 import android.content.pm.ServiceInfo
 import android.os.Build
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toFile
@@ -29,6 +30,7 @@ import com.yenaly.han1meviewer.util.installApkPackage
 import com.yenaly.han1meviewer.util.runSuspendCatching
 import com.yenaly.han1meviewer.util.updateFile
 import com.yenaly.yenaly_libs.utils.showShortToast
+import java.util.Locale
 import kotlin.random.Random
 
 /**
@@ -105,8 +107,8 @@ class HUpdateWorker(
             val file = context.updateFile.apply { delete() }
             val inject = runSuspendCatching {
                 setForeground(createForegroundInfo())
-                file.injectUpdate(downloadLink) { progress ->
-                    updateNotification(progress)
+                file.injectUpdate(downloadLink) { progress, fileSize, downloadedSize ->
+                    updateNotification(progress, fileSize, downloadedSize)
                 }
             }
             if (inject.isSuccess) {
@@ -121,20 +123,38 @@ class HUpdateWorker(
         }
     }
 
-    private fun createNotification(progress: Int = 0): Notification {
+    private fun createNotification(progress: Int = 0, fileSizeMB: String = "0", downloadedSizeMB: String = "0"): Notification {
         return NotificationCompat.Builder(context, UPDATE_NOTIFICATION_CHANNEL)
             .setSmallIcon(R.mipmap.ic_launcher)
             .setOngoing(true)
-            .setContentTitle(context.getString(R.string.downloading_update_percent, progress))
+            .setContentTitle(
+                context.getString(
+                    R.string.downloading_update_percent, progress
+                ) + " ($downloadedSizeMB MB / $fileSizeMB MB)"
+            )
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setOnlyAlertOnce(true)
             .setProgress(100, progress, false)
             .build()
     }
 
+    private var lastNotifyTime = 0L  // 节流，通知更新太快Android会抛异常
     @SuppressLint("MissingPermission")
-    private fun updateNotification(progress: Int) {
-        notificationManager.notify(downloadId, createNotification(progress))
+    private fun updateNotification(progress: Int, fileSize: Long, downloadedSize: Long) {
+        val now = System.currentTimeMillis()
+        if (progress == 100 || now - lastNotifyTime > 1000) {
+            lastNotifyTime = now
+            val fileSizeMB = String.format(Locale.US, "%.2f", fileSize.toDouble() / (1024 * 1024))
+            val downloadedSizeMB = String.format(Locale.US, "%.2f", downloadedSize.toDouble() / (1024 * 1024))
+            notificationManager.notify(
+                downloadId,
+                createNotification(
+                    progress,
+                    fileSizeMB,
+                    downloadedSizeMB
+                )
+            )
+        }
     }
 
     private fun createForegroundInfo(progress: Int = 0): ForegroundInfo {