2.0.beta12

1. 更新API

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -4,17 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../.gradle/caches/transforms-3/530137dbe1613faf299d06bd64f02665/transformed/jetified-search-2.4.1/res/layout/search_view.xml" value="0.46557971014492755" />
+        <entry key="app/src/main/res/drawable-anydpi/ic_like.xml" value="0.5572916666666666" />
+        <entry key="app/src/main/res/drawable-anydpi/ic_setting_search.xml" value="0.5572916666666666" />
+        <entry key="app/src/main/res/layout/activity_dl.xml" value="0.5025484199796126" />
+        <entry key="app/src/main/res/layout/activity_dlist.xml" value="0.48641304347826086" />
+        <entry key="app/src/main/res/layout/activity_login.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.5095108695652174" />
+        <entry key="app/src/main/res/layout/app_bar_main.xml" value="0.5095108695652174" />
+        <entry key="app/src/main/res/layout/card_book.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/card_book_plain.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/content_main.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/fragment_book.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/fragment_chapters.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/fragment_download.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/fragment_home.xml" value="0.4376278118609407" />
+        <entry key="app/src/main/res/layout/line_1bookline.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/line_bookinfo.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/line_booktandb.xml" value="0.48596014492753625" />
+        <entry key="app/src/main/res/layout/line_chapter.xml" value="0.48596014492753625" />
+        <entry key="app/src/main/res/layout/line_choice_list.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/line_text_info.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/line_word.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/nav_header_main.xml" value="0.48596014492753625" />
+        <entry key="app/src/main/res/layout/viewpage_banner.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/layout/viewpage_horizonal.xml" value="0.49592391304347827" />
+        <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.5572916666666666" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId 'top.fumiama.copymanga'
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 23
+        versionCode 24
-        versionName '2.0.beta11'
+        versionName '2.0.beta12'
         resConfigs "zh", "zh-rCN"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/androidTest/java/top/fumiama/dmzj/dmzjxs/ExampleInstrumentedTest.kt

@@ -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)
-    }
-}

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) }
 

app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt

@@ -304,11 +304,11 @@ class BookHandler(that: WeakReference<BookFragment>, 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 =
+                        val r = Gson().fromJson(result?.decodeToString(), VolumeStructure::class.java)
-                            Gson().fromJson(result?.decodeToString(), VolumeStructure::class.java)
                         re[r.results.offset / 100] = r
                     }
                     ads += ad

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

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<FutureTask<ByteArray?>?>? = null

app/src/test/java/top/fumiama/dmzj/dmzjxs/ExampleUnitTest.kt

@@ -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)
-    }
-}

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