diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat index 5ac2e4d..22bb4cb 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_left.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_left.xml.flat index 876967f..68c5c5f 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_left.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_left.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_right.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_right.xml.flat index a2fa361..4ff8511 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_right.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_right.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_top.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_top.xml.flat index 68a3b83..ec0d8a3 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_top.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/drawable_default_scroll_handle_top.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml index cc80bfe..0d7c49a 100644 --- a/androidpdfviewer/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidpdfviewer/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeReleaseShaders/merger.xml index ce029d4..6f8adfd 100644 --- a/androidpdfviewer/build/intermediates/incremental/mergeReleaseShaders/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/mergeReleaseShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidpdfviewer/build/intermediates/incremental/packageReleaseAssets/merger.xml b/androidpdfviewer/build/intermediates/incremental/packageReleaseAssets/merger.xml index e4a72e4..eeeaad1 100644 --- a/androidpdfviewer/build/intermediates/incremental/packageReleaseAssets/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/packageReleaseAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties index a1b6b6b..f179441 100644 --- a/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ b/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties @@ -1,5 +1,5 @@ -#Sat Jan 18 02:33:28 CST 2025 -com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_bottom.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_bottom.xml -com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_left.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_left.xml -com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_right.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_right.xml -com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_top.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_top.xml +#Wed Feb 12 16:31:02 CST 2025 +com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_bottom.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_bottom.xml +com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_left.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_left.xml +com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_right.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_right.xml +com.github.barteksc.pdfviewer.androidpdfviewer-main-5\:/drawable/default_scroll_handle_top.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/release/packageReleaseResources/drawable/default_scroll_handle_top.xml diff --git a/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/merger.xml index dd034ab..f16d0ba 100644 --- a/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/merger.xml @@ -1,10 +1,10 @@ - + - + diff --git a/androidpdfviewer/build/outputs/logs/manifest-merger-release-report.txt b/androidpdfviewer/build/outputs/logs/manifest-merger-release-report.txt index a60201b..9a35050 100644 --- a/androidpdfviewer/build/outputs/logs/manifest-merger-release-report.txt +++ b/androidpdfviewer/build/outputs/logs/manifest-merger-release-report.txt @@ -1,16 +1,16 @@ -- Merging decision tree log --- manifest -ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12 -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12 +ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12 +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:1-4:12 package - INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml xmlns:android - ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 + ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 uses-sdk -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml android:targetSdkVersion - INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml diff --git a/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin b/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin index 1a531a7..b5dfeb8 100644 Binary files a/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin and b/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin differ diff --git a/androidslantedtextview/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml index 90785d3..0b74f9a 100644 --- a/androidslantedtextview/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidslantedtextview/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeReleaseShaders/merger.xml index dc65383..a5a97d4 100644 --- a/androidslantedtextview/build/intermediates/incremental/mergeReleaseShaders/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/mergeReleaseShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidslantedtextview/build/intermediates/incremental/packageReleaseAssets/merger.xml b/androidslantedtextview/build/intermediates/incremental/packageReleaseAssets/merger.xml index ff7e8af..c32b310 100644 --- a/androidslantedtextview/build/intermediates/incremental/packageReleaseAssets/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/packageReleaseAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties index f560e28..ec594ca 100644 --- a/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ b/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Jan 18 02:33:28 CST 2025 +#Wed Feb 12 16:31:03 CST 2025 diff --git a/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml index 9837aae..d18ed7f 100644 --- a/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - Libary + Libary diff --git a/androidslantedtextview/build/outputs/logs/manifest-merger-release-report.txt b/androidslantedtextview/build/outputs/logs/manifest-merger-release-report.txt index fe83577..1c68210 100644 --- a/androidslantedtextview/build/outputs/logs/manifest-merger-release-report.txt +++ b/androidslantedtextview/build/outputs/logs/manifest-merger-release-report.txt @@ -1,16 +1,16 @@ -- Merging decision tree log --- manifest -ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12 -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12 +ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12 +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:1-3:12 package - INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml xmlns:android - ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 + ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 uses-sdk -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml -INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml +INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml android:targetSdkVersion - INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index a4f8ce3..0e53a0e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -21,9 +21,12 @@ #-renamesourcefileattribute SourceFile + + -keep class org.xmlpull.v1.** { *;} -dontwarn org.xmlpull.v1.** + -keep class com.rehome.zhdcoa.App #-keep class com.rehome.zhdcoa.Contans @@ -68,14 +71,15 @@ -keepattributes Signature -keepattributes SourceFile,LineNumberTable + #记录生成的日志数据,gradle build时在本项目根目录输出apk 包内所有 class 的内部结构 --dump class_files.txt -#未混淆的类和成员 --printseeds seeds.txt -#列出从 apk 中删除的代码 --printusage unused.txt -#混淆前后的映射 --printmapping mapping.txt +#-dump class_files.txt +##未混淆的类和成员 +#-printseeds seeds.txt +##列出从 apk 中删除的代码 +#-printusage unused.txt +##混淆前后的映射 +#-printmapping mapping.txt # #<基础> @@ -261,4 +265,7 @@ -keep class com.luck.lib.camerax.** { *; } -dontwarn com.yalantis.ucrop** -keep class com.yalantis.ucrop** { *; } --keep interface com.yalantis.ucrop** { *; } \ No newline at end of file +-keep interface com.yalantis.ucrop** { *; } + +#-ignorewarnings +#-libraryjars libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar diff --git a/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar b/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar index 7244edc..6b5c741 100644 Binary files a/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar and b/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar differ