From d94675a1b719f9bb21f0f027d1c79c3617f374ba Mon Sep 17 00:00:00 2001
From: fumiama <s862105088@gmail.com>
Date: Fri, 14 May 2021 23:08:28 +0800
Subject: [PATCH] =?UTF-8?q?2.0.beta7=200.=20=E4=BF=AE=E5=A4=8Dbeta6?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=A7=82=E7=9C=8B=E9=97=AA=E9=80=80=201.=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=AB=E7=94=BB=E5=B0=81=E9=9D=A2=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E7=9A=84=E4=B8=BB=E9=A1=B5=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=202.=20=E5=A2=9E=E5=8A=A0=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=88=B0=E4=BD=9C=E8=80=85=E3=80=81=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=203.=20=E5=A2=9E=E5=8A=A0=E9=98=85=E8=A7=88=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E3=80=81=E9=9F=B3=E9=87=8F=E9=94=AE=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?=E5=8F=8C=E9=A1=B5=E5=88=87=E5=88=86=204.=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8D=B7=E8=BD=B4=E6=A8=A1=E5=BC=8F=E3=80=81=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                              | 4 ++--
 .../fumiama/copymanga/template/general/ActivityTemplate.kt    | 2 +-
 .../java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt     | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

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<ViewMangaActivity>? = null
         var pn = 0
+        var noCellarAlert = false
     }
 }
\ No newline at end of file