From d931b1334d4c3d461c191c5d28b9d739b4f7b908 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: Fri, 17 Jun 2022 13:31:21 +0800 Subject: [PATCH] =?UTF-8?q?1.4.2=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 3 +- .idea/misc.xml | 32 ++++++++++++++++++- .idea/runConfigurations.xml | 10 ------ app/build.gradle | 12 +++---- app/src/main/AndroidManifest.xml | 2 +- .../fumiama/copymanga/web/WebViewClient.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- build.gradle | 4 +-- 9 files changed, 44 insertions(+), 25 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..61a9130 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 23a89bb..2c7e034 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..8fa2446 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,36 @@ - + + + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 68b42e6..ca0f8d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'AndResGuard' android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion "30.0.2" defaultConfig { applicationId "top.fumiama.copymanga" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 12 versionName '1.4.1' resConfigs "zh", "zh-rCN" @@ -51,15 +51,15 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.core:core-ktx:1.8.0' //implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' //implementation 'com.google.android.material:material:1.2.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' implementation 'com.google.code.gson:gson:2.8.6' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2d18a56..a3a3ec6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme" > - + diff --git a/app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt b/app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt index 6605af8..a134988 100644 --- a/app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt +++ b/app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt @@ -24,7 +24,7 @@ class WebViewClient(private val context: Context, jsFileName: String):WebViewCli override fun onPageFinished(view: WebView?, url: String?) { super.onPageFinished(view, url) url?.let { - view?.loadUrl(js) + view?.postDelayed({view.loadUrl(js)}, 1000) } } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 10991ce..86489e3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ 拷贝漫画 - https://www.copymanga.com/h5/init + https://copymanga.net/h5/init https://www.copymanga.net https://www.copymanga.net/comic diff --git a/build.gradle b/build.gradle index 7bc18e2..e583165 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.5.31' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.21'