diff --git a/app/build.gradle b/app/build.gradle index 3942c99..1fd51de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { compileSdk 34 applicationId 'top.fumiama.copymanga' minSdkVersion 23 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 37 versionName '2.0.1' resConfigs 'zh', 'zh-rCN' diff --git a/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt b/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt index 7df0ee1..cf3b38d 100644 --- a/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt +++ b/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt @@ -80,7 +80,7 @@ class BookHandler(private val th: WeakReference, val path: String) override fun onError() { super.onError() if(exit) return - if(!hasToastedError) { + if(!hasToastedError) that?.activity?.runOnUiThread { Toast.makeText(that?.context, R.string.null_book, Toast.LENGTH_SHORT).show() that?.apply { findNavController().popBackStack() } } @@ -318,9 +318,9 @@ class BookHandler(private val th: WeakReference, val path: String) val times = counts[i] / 100 val remain = counts[i] % 100 val re = arrayOfNulls(if(remain != 0) (times+1) else (times)) - if (re.isEmpty()) { + if (re.isEmpty()) that?.activity?.runOnUiThread { Toast.makeText(that?.context, "获取${gpw}失败", Toast.LENGTH_SHORT).show() - return@forEachIndexed + return@runOnUiThread } Log.d("MyBFH", "${i}卷共${if(times == 0) 1 else times}次加载") do { @@ -393,8 +393,8 @@ class BookHandler(private val th: WeakReference, val path: String) imic.drawable.toBitmap().compress(Bitmap.CompressFormat.JPEG, 90, fo) } catch (e: Exception) { e.printStackTrace() - mainWeakReference?.get()?.apply { - Toast.makeText(this, R.string.download_cover_error, Toast.LENGTH_SHORT).show() + that?.activity?.runOnUiThread { + Toast.makeText(that?.context, R.string.download_cover_timeout, Toast.LENGTH_SHORT).show() } } fo.close() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46db98e..3d2c33a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -37,7 +37,7 @@ N/A 获取图书信息失败 网络错误 - 保存封面出错 + 保存封面超时 https://%1$s/api/v3/h5/homeIndex?platform=3 https://%1$s