diff --git a/app/build.gradle b/app/build.gradle index 34788ed..1b2bc1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId 'top.fumiama.copymanga' minSdkVersion 23 targetSdkVersion 30 - versionCode 17 - versionName '2.0.beta6' + versionCode 18 + versionName '2.0.beta7' resConfigs "zh", "zh-rCN" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/top/fumiama/copymanga/template/general/ActivityTemplate.kt b/app/src/main/java/top/fumiama/copymanga/template/general/ActivityTemplate.kt index 7d3a9c7..86c56b7 100644 --- a/app/src/main/java/top/fumiama/copymanga/template/general/ActivityTemplate.kt +++ b/app/src/main/java/top/fumiama/copymanga/template/general/ActivityTemplate.kt @@ -17,7 +17,7 @@ open class ActivityTemplate:Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) p = PropertiesTools(File("$filesDir/settings.properties")) - toolsBox = UITools(WeakReference(this)) + toolsBox = UITools(this) } override fun onWindowFocusChanged(hasFocus: Boolean) { diff --git a/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt b/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt index b0e1959..f9ec8a5 100644 --- a/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt +++ b/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt @@ -41,6 +41,7 @@ import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.File import java.io.InputStream +import java.lang.Thread.sleep import java.lang.ref.WeakReference import java.util.* import java.util.concurrent.FutureTask @@ -145,7 +146,7 @@ class ViewMangaActivity : TitleActivityTemplate() { } private fun alertCellar() { - toolsBox.buildInfo("注意", "要使用使用流量观看吗?", "确定", null, "取消", {handler.startLoad()}, null, {finish()}) + toolsBox.buildInfo("注意", "要使用使用流量观看吗?", "确定", "不再提醒", "取消", {handler.startLoad()}, { noCellarAlert = true; handler.startLoad()}, {finish()}) } fun restorePN(){ @@ -668,5 +669,6 @@ class ViewMangaActivity : TitleActivityTemplate() { var dlhandler: Handler? = null var va: WeakReference? = null var pn = 0 + var noCellarAlert = false } } \ No newline at end of file