renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2022-05-19 10:27:18 +08:00
parent 7ef4688a90 2446be96ed
commit 3958521829
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/legado/app/constant/AppConst.kt
View File

@@ -60,7 +60,7 @@ object AppConst {
val sysElevation = appCtx.resources.getDimension(R.dimen.design_appbar_elevation).toInt()
val androidId: String by lazy {
Settings.System.getString(appCtx.contentResolver, Settings.Secure.ANDROID_ID)
Settings.System.getString(appCtx.contentResolver, Settings.Secure.ANDROID_ID) ?: "null"
}
val appInfo: AppInfo by lazy {

6
app/src/main/java/io/legado/app/utils/BitmapUtils.kt
View File

@@ -53,13 +53,13 @@ object BitmapUtils {
height: Int? = null
): Int {
//获取比例大小
val wRatio = width?.let { ceil((options.outWidth / it).toDouble()).toInt() } ?: -1
val hRatio = height?.let { ceil((options.outHeight / it).toDouble()).toInt() } ?: -1
val wRatio = width?.let { ceil((options.outWidth / it.toFloat())).toInt() } ?: -1
val hRatio = height?.let { ceil((options.outHeight / it.toFloat())).toInt() } ?: -1
//如果超出指定大小，则缩小相应的比例
return when {
wRatio > 1 && hRatio > 1 -> max(wRatio, hRatio)
wRatio > 1 -> wRatio
hRatio > 1 -> hRatio
hRatio > 1 -> hRatio
else -> 1
}
}