From 36852a52dd8d635fb9179c646a0254d84cf5d23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 15 Oct 2022 21:36:19 +0800 Subject: [PATCH] =?UTF-8?q?2.0.beta12=201.=20=E6=9B=B4=E6=96=B0API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 5 ++- .idea/misc.xml | 34 ++++++++++++++++++- app/build.gradle | 4 +-- .../dmzj/dmzjxs/ExampleInstrumentedTest.kt | 24 ------------- .../copymanga/tools/http/DownloadTools.kt | 1 + .../fumiama/copymanga/ui/book/BookHandler.kt | 4 +-- .../ui/cardflow/sort/SortFragment.kt | 2 +- .../copymanga/ui/vm/ViewMangaActivity.kt | 5 ++- .../fumiama/dmzj/dmzjxs/ExampleUnitTest.kt | 17 ---------- build.gradle | 2 +- 11 files changed, 47 insertions(+), 53 deletions(-) delete mode 100644 app/src/androidTest/java/top/fumiama/dmzj/dmzjxs/ExampleInstrumentedTest.kt delete mode 100644 app/src/test/java/top/fumiama/dmzj/dmzjxs/ExampleUnitTest.kt diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 9bba60d..7b46144 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,17 +4,16 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..6957712 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,38 @@ - + + + + diff --git a/app/build.gradle b/app/build.gradle index 110361b..b18a0e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId 'top.fumiama.copymanga' minSdkVersion 23 targetSdkVersion 31 - versionCode 23 - versionName '2.0.beta11' + versionCode 24 + versionName '2.0.beta12' resConfigs "zh", "zh-rCN" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/androidTest/java/top/fumiama/dmzj/dmzjxs/ExampleInstrumentedTest.kt b/app/src/androidTest/java/top/fumiama/dmzj/dmzjxs/ExampleInstrumentedTest.kt deleted file mode 100644 index e52f095..0000000 --- a/app/src/androidTest/java/top/fumiama/dmzj/dmzjxs/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package top.fumiama.dmzj.dmzjxs - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("top.fumiama.dmzj.dmzjxs", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt b/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt index 6ea8636..4b91fe2 100644 --- a/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt +++ b/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt @@ -45,6 +45,7 @@ object DownloadTools { setRequestProperty("source", "copyApp") setRequestProperty("webp", "1") setRequestProperty("region", "0") + setRequestProperty("authorization", "Token") setRequestProperty("platform", "3") ua?.let { setRequestProperty("User-agent", it) } 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 4ec307a..a1beaa0 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 @@ -304,11 +304,11 @@ class BookHandler(that: WeakReference, private val path: String) do { counts[i] = counts[i] - 100 CMApi.getApiUrl(R.string.groupInfoApiUrl, path, gpw, offset)?.let { + Log.d("MyBFH", "get api: $it") if(ComicDlFragment.exit) return val ad = AutoDownloadThread(it) { result -> Log.d("MyBFH", "第${i}卷返回") - val r = - Gson().fromJson(result?.decodeToString(), VolumeStructure::class.java) + val r = Gson().fromJson(result?.decodeToString(), VolumeStructure::class.java) re[r.results.offset / 100] = r } ads += ad diff --git a/app/src/main/java/top/fumiama/copymanga/ui/cardflow/sort/SortFragment.kt b/app/src/main/java/top/fumiama/copymanga/ui/cardflow/sort/SortFragment.kt index ef8424b..f2805f2 100644 --- a/app/src/main/java/top/fumiama/copymanga/ui/cardflow/sort/SortFragment.kt +++ b/app/src/main/java/top/fumiama/copymanga/ui/cardflow/sort/SortFragment.kt @@ -16,7 +16,7 @@ import java.lang.Thread.sleep @ExperimentalStdlibApi class SortFragment : InfoCardLoader(R.layout.fragment_sort, R.id.action_nav_sort_to_nav_book) { - private val sortWay = listOf("datetime_updated", "-datetime_updated", "popular", "-popular") + private val sortWay = listOf("-datetime_updated", "datetime_updated", "popular", "-popular") private var theme = -1 private var sortValue = 0 private var filter: FilterStructure? = null 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 e771b2d..d94b4fd 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 @@ -71,7 +71,10 @@ class ViewMangaActivity : TitleActivityTemplate() { set(value) = setPageNumber(value) //var pn = 0 private val isPnValid: Boolean get(){ - if(pn == -2) pn = realCount + if(pn == -2) { + pn = 0 + return true + } return intent.getStringExtra("function") == "log" && pn > 0 } private var tasks: Array?>? = null diff --git a/app/src/test/java/top/fumiama/dmzj/dmzjxs/ExampleUnitTest.kt b/app/src/test/java/top/fumiama/dmzj/dmzjxs/ExampleUnitTest.kt deleted file mode 100644 index 0cb541b..0000000 --- a/app/src/test/java/top/fumiama/dmzj/dmzjxs/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package top.fumiama.dmzj.dmzjxs - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9f9ecb3..a0c493b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong