diff --git a/app/build.gradle b/app/build.gradle index 4959bf7..be4a792 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,6 +30,7 @@ android { // Make sure libjsc.so does not packed in APK //pickFirst '**/libc++_shared.so' //exclude("META-INF/*.kotlin_module") + pickFirst '**/META-INF/DEPENDENCIES' } /*repositories { flatDir { diff --git a/bigimageviewpager/build.gradle b/bigimageviewpager/build.gradle index 9eef1df..4785b43 100644 --- a/bigimageviewpager/build.gradle +++ b/bigimageviewpager/build.gradle @@ -61,7 +61,7 @@ dependencies { api 'com.github.bumptech.glide:annotations:4.11.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' //注解处理器 //api 'com.github.hss01248:PageStateManager:3.0.5' - api 'com.github.hss01248.utilcodeEnhance:viewState:1.3.2' + api 'com.github.hss01248.utilcodeEnhance:viewState:1.4.3' api 'me.jessyan:progressmanager:1.5.0' //https://github.com/JessYanCoding/ProgressManager @@ -76,7 +76,7 @@ dependencies { api 'androidx.lifecycle:lifecycle-common-java8:2.2.0' api 'com.github.Jarvis-Lau:GestureViewBinder:1.0.3' - api "com.github.hss01248.utilcodeEnhance:fullScreenDialog:1.2.1" + api "com.github.hss01248.utilcodeEnhance:fullScreenDialog:1.4.3" api('com.davemorrissey.labs:subsampling-scale-image-view:3.10.0') { exclude group: 'com.android.support' diff --git a/downloader/build.gradle b/downloader/build.gradle index 97fd166..28adf66 100644 --- a/downloader/build.gradle +++ b/downloader/build.gradle @@ -37,7 +37,7 @@ android { } dependencies { - api "com.github.hss01248.utilcodeEnhance:lib-base:1.4.0" + api "com.github.hss01248.utilcodeEnhance:lib-base:1.4.3" implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'com.google.android.material:material:1.4.0' testImplementation 'junit:junit:4.+' diff --git a/downloader/src/main/java/com/hss/downloader/DownloadList.java b/downloader/src/main/java/com/hss/downloader/DownloadList.java index a0ead0b..3af111a 100644 --- a/downloader/src/main/java/com/hss/downloader/DownloadList.java +++ b/downloader/src/main/java/com/hss/downloader/DownloadList.java @@ -98,7 +98,7 @@ public void onMessageEvent(DownloadResultEvent info) { String text = "("+(successCount) +",f-"+(failCount)+")/"+total+",cost:"+ DateUtils.formatElapsedTime((System.currentTimeMillis() - timeStart)/1000); binding.tvTotalProgress.setText(text); - CommonProgressService.updateProgress(progress, (int) total,"图片下载中","图片下载: "+progress+"/"+total); + CommonProgressService.updateProgress(progress, (int) total,"图片下载中","图片下载: "+progress+"/"+total,0); } DownloadListViewBinding binding; long total; diff --git a/downloader/src/main/java/com/hss/downloader/MyDownloader.java b/downloader/src/main/java/com/hss/downloader/MyDownloader.java index 75fc0ea..c691e2e 100644 --- a/downloader/src/main/java/com/hss/downloader/MyDownloader.java +++ b/downloader/src/main/java/com/hss/downloader/MyDownloader.java @@ -246,7 +246,7 @@ public List doInBackground() throws Throwable { public void onSuccess(List result) { LogUtils.i("批量下载开始,更新数据库耗时(s):",(System.currentTimeMillis() - start)/1000f); dialog.dismiss(); - CommonProgressService.startS("图片下载中", "图片下载中...", new Runnable() { + CommonProgressService.startS("图片下载中", "图片下载中...", 0,new Runnable() { @Override public void run() { new DownloadList().showList(ActivityUtils.getTopActivity(),result); diff --git a/myblog/build.gradle b/myblog/build.gradle index 6ff06a5..32597e9 100644 --- a/myblog/build.gradle +++ b/myblog/build.gradle @@ -36,7 +36,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' - api 'com.github.hss01248.utilcodeEnhance:baseWebview:1.2.1' + api 'com.github.hss01248.utilcodeEnhance:baseWebview:1.4.3' } configurations { diff --git a/webviewspider/build.gradle b/webviewspider/build.gradle index 4fa1518..6cb02a2 100644 --- a/webviewspider/build.gradle +++ b/webviewspider/build.gradle @@ -51,8 +51,8 @@ dependencies { api 'org.jsoup:jsoup:1.11.2' api 'com.blankj:utilcodex:1.30.6' api project(':imagelist') - api 'com.github.hss01248.utilcodeEnhance:baseWebview:1.2.1' - api 'com.github.hss01248.utilcodeEnhance:iwidget:1.2.1' + api 'com.github.hss01248.utilcodeEnhance:baseWebview:1.4.3' + api 'com.github.hss01248.utilcodeEnhance:iwidget:1.4.3' //api project(':baseWebview')