diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat index e334d32..cc45347 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_bottom.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat index e100c11..2483d6d 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_left.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat index 252684c..f8f8702 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_right.xml.flat differ diff --git a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat index 6bc4743..c192b9b 100644 Binary files a/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat and b/androidpdfviewer/build/intermediates/compiled_local_resources/debug/compileDebugLibraryResources/out/drawable_default_scroll_handle_top.xml.flat differ 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 22bb4cb..5ac2e4d 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 68c5c5f..876967f 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 4ff8511..a2fa361 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 ec0d8a3..68a3b83 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/debug/packageDebugResources/compile-file-map.properties b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 4079bae..6bce05c 100644 --- a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,5 +1,5 @@ -#Thu Jan 16 15:52:30 CST 2025 -com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_bottom.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_bottom.xml -com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_left.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_left.xml -com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_right.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_right.xml -com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_top.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_top.xml +#Sat Jan 18 02:24:51 CST 2025 +com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_bottom.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_bottom.xml +com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_left.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_left.xml +com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_right.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_right.xml +com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_top.xml=/Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_top.xml diff --git a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 5ff0fdd..4484e5f 100644 --- a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,10 +1,10 @@ - + - + diff --git a/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 000c800..d4ef047 100644 --- a/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/mergeDebugJniLibFolders/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/mergeDebugShaders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/merger.xml index fae6518..7034c6f 100644 --- a/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/mergeDebugShaders/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/mergeReleaseJniLibFolders/merger.xml b/androidpdfviewer/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml index 0d7c49a..cc80bfe 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 6f8adfd..ce029d4 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/packageDebugAssets/merger.xml b/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml index 71268bd..0a89583 100644 --- a/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/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 eeeaad1..e4a72e4 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 0287a80..a1b6b6b 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 @@ -#Thu Jan 16 15:53:13 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 +#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 diff --git a/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/androidpdfviewer/build/intermediates/incremental/release/packageReleaseResources/merger.xml index f16d0ba..dd034ab 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-debug-report.txt b/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt index 9a35050..a60201b 100644 --- a/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt +++ b/androidpdfviewer/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,16 +1,16 @@ -- Merging decision tree log --- manifest -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 +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 package - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml xmlns:android - ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 + ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 uses-sdk -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 +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 android:targetSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml diff --git a/androidpdfviewer/build/outputs/logs/manifest-merger-release-report.txt b/androidpdfviewer/build/outputs/logs/manifest-merger-release-report.txt index 9a35050..a60201b 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 /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 +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 package - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml xmlns:android - ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 + ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml:2:11-69 uses-sdk -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 +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 android:targetSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml diff --git a/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index b5dfeb8..1a531a7 100644 Binary files a/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin b/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin index b5dfeb8..1a531a7 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/debug/packageDebugResources/compile-file-map.properties b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 1e82ec3..8356274 100644 --- a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Thu Jan 16 15:52:30 CST 2025 +#Sat Jan 18 02:24:51 CST 2025 diff --git a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 212eacf..296a83f 100644 --- a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - Libary + Libary diff --git a/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index f1bb334..e90e860 100644 --- a/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/mergeDebugJniLibFolders/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/mergeDebugShaders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/merger.xml index 0f60cf4..496d7cb 100644 --- a/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/mergeDebugShaders/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/mergeReleaseJniLibFolders/merger.xml b/androidslantedtextview/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml index 0b74f9a..90785d3 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 a5a97d4..dc65383 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/packageDebugAssets/merger.xml b/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml index 231b2fa..ec9c260 100644 --- a/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/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 c32b310..ff7e8af 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 336da7b..f560e28 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 @@ -#Thu Jan 16 15:53:14 CST 2025 +#Sat Jan 18 02:33:28 CST 2025 diff --git a/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml index d18ed7f..9837aae 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-debug-report.txt b/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt index 1c68210..fe83577 100644 --- a/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt +++ b/androidslantedtextview/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,16 +1,16 @@ -- Merging decision tree log --- manifest -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 +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 package - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml xmlns:android - ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 + ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 uses-sdk -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 +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 android:targetSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml diff --git a/androidslantedtextview/build/outputs/logs/manifest-merger-release-report.txt b/androidslantedtextview/build/outputs/logs/manifest-merger-release-report.txt index 1c68210..fe83577 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 /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 +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 package - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml xmlns:android - ADDED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 + ADDED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml:1:11-69 uses-sdk -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 +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 android:targetSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml + INJECTED from /Users/edao/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml diff --git a/app/build.gradle b/app/build.gradle index de64c92..221cd79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation files('libs/pdf.aar') implementation files('libs/ZSDK_API.jar') implementation files('libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar') - implementation files('libs/MiPush_SDK_Client_3_4_3.jar') +// implementation files('libs/MiPush_SDK_Client_3_4_3.jar') implementation files('libs/badgeview.jar') implementation files('libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar') // implementation 'androidx.appcompat:appcompat:1.6.1' @@ -119,6 +119,9 @@ dependencies { implementation project(':videocompressor') //实时录音wav转mp3 implementation project(':recorderlib') + //下拉刷新 +// implementation project(':refreshheader') +// implementation project(':refreshlayout') @@ -160,15 +163,15 @@ dependencies { implementation 'com.github.baoyachi:StepView:1.9' implementation 'io.github.azhon:appupdate:4.2.6' implementation 'com.tencent.bugly:crashreport:3.2.1' - implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-header:1.1.5' - implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-layout:1.1.5' +// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-header:1.1.5' +// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-layout:1.1.5' //implementation 'com.just.agentweb:agentweb:4.1.4' //第三方浏览器 implementation 'io.github.justson:agentweb-core:v5.1.1-androidx' //implementation 'com.lcodecorex:tkrefreshlayout:1.0.7' implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' - implementation files('../libs/poi-3.9-20121203.jar') - implementation files('../libs/poi-scratchpad-3.9-20121203.jar') +// implementation files('../libs/poi-3.9-20121203.jar') +// implementation files('../libs/poi-scratchpad-3.9-20121203.jar') // implementation 'androidx.activity:activity:1.8.0' // testImplementation 'junit:junit:4.13.1' // androidTestImplementation 'androidx.test.ext:junit:1.1.2' diff --git a/app/libs/MiPush_SDK_Client_3_4_3.jar b/app/libs/MiPush_SDK_Client_3_4_3.jar deleted file mode 100644 index a6e5790..0000000 Binary files a/app/libs/MiPush_SDK_Client_3_4_3.jar and /dev/null differ diff --git a/app/src/main/java/com/rehome/zhdcoa/App.java b/app/src/main/java/com/rehome/zhdcoa/App.java index 3558dd2..5ca96c2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/App.java +++ b/app/src/main/java/com/rehome/zhdcoa/App.java @@ -28,9 +28,6 @@ import com.rehome.zhdcoa.utils.SPUtils; //import com.squareup.leakcanary.LeakCanary; //import com.squareup.leakcanary.RefWatcher; import com.tencent.bugly.crashreport.CrashReport; -import com.xiaomi.channel.commonutils.logger.LoggerInterface; -import com.xiaomi.mipush.sdk.Logger; -import com.xiaomi.mipush.sdk.MiPushClient; import com.xuexiang.xui.XUI; import com.yolanda.nohttp.NoHttp; import com.zhy.autolayout.config.AutoLayoutConifg; @@ -93,21 +90,6 @@ public class App extends LitePalApplication { XUI.init(this); //初始化UI框架 CrashReport.initCrashReport(getApplicationContext(), "13d735012a", true); loadEmojiFromBundled(); - LoggerInterface newLogger = new LoggerInterface() { - @Override - public void setTag(String tag) { - } - - @Override - public void log(String content, Throwable t) { - } - - @Override - public void log(String content) { - } - }; - Logger.setLogger(this, newLogger); - //BuildConfig.DEBUG diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryMemberStatistics.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryMemberStatistics.java index 30fe477..46c5745 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryMemberStatistics.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryMemberStatistics.java @@ -21,7 +21,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener; import com.rehome.zhdcoa.utils.RSAAndroid; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; @@ -44,7 +43,6 @@ import javax.net.ssl.SSLSocketFactory; public class ActivityFactoryMemberStatistics extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; LinearLayout lv_member_tile; LinearLayout lv_member_nodata; @@ -61,7 +59,7 @@ public class ActivityFactoryMemberStatistics extends BaseActivity { private void findView(){ recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); + //refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); lv_member_tile = findViewById(R.id.lv_member_tile); lv_member_nodata = findViewById(R.id.lv_member_nodata); @@ -115,8 +113,8 @@ public class ActivityFactoryMemberStatistics extends BaseActivity { public void initData() { authenticationLoginAI(); - //getMemberInfoList(); - refreshLayout.setOnRefreshListener(refreshLayout -> getMemberInfoList()); + getMemberInfoList(); + } public void authenticationLoginAI(){ @@ -184,7 +182,7 @@ public class ActivityFactoryMemberStatistics extends BaseActivity { lv_member_nodata.setVisibility(View.VISIBLE); } } - refreshLayout.finishRefresh(true); + //refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroup.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroup.java index f81480a..a054616 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroup.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroup.java @@ -21,7 +21,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener; import com.rehome.zhdcoa.utils.RSAAndroid; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; @@ -44,7 +43,6 @@ import javax.net.ssl.SSLSocketFactory; public class ActivityFactoryWorkerInfoGroup extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; LinearLayout lv_member_nodata; @@ -60,7 +58,6 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity { private void findView(){ recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); lv_member_nodata = findViewById(R.id.lv_member_nodata); } @@ -113,7 +110,7 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity { @Override public void initData() { authenticationLoginAI(); - refreshLayout.setOnRefreshListener(refreshLayout -> getFactoryWorkerInfoList()); + getFactoryWorkerInfoList(); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(ActivityFactoryWorkerInfoGroup.this, ActivityFactoryWorkerInfoGroupMember.class); intent.putExtra("company", item.getCompany()); @@ -193,7 +190,6 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity { lv_member_nodata.setVisibility(View.VISIBLE); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroupMember.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroupMember.java index 2993174..70823d2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroupMember.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroupMember.java @@ -21,7 +21,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener; import com.rehome.zhdcoa.utils.RSAAndroid; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; @@ -43,7 +42,6 @@ import javax.net.ssl.SSLSocketFactory; */ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; LinearLayout lv_member_nodata; @@ -60,7 +58,6 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity { private void findView(){ recyclerView = findViewById(R.id.recycler_view); lv_member_nodata = findViewById(R.id.lv_member_nodata); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); } @@ -114,7 +111,7 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity { public void initData() { authenticationLoginAI(); //getFactoryWorkerInfoList(); - refreshLayout.setOnRefreshListener(refreshLayout -> getFactoryWorkerInfoList()); + getFactoryWorkerInfoList(); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(ActivityFactoryWorkerInfoGroupMember.this, ActivityFactoryMemberTrack.class); intent.putExtra("card_no", item.getCardId()); @@ -192,7 +189,6 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity { lv_member_nodata.setVisibility(View.VISIBLE); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoStatistics.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoStatistics.java index c169530..b84485c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoStatistics.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoStatistics.java @@ -23,7 +23,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.OnAuthenticationLoginListener; import com.rehome.zhdcoa.utils.RSAAndroid; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; @@ -45,7 +44,6 @@ import javax.net.ssl.SSLSocketFactory; public class ActivityFactoryWorkerInfoStatistics extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; LinearLayout lv_member_nodata; @@ -57,7 +55,6 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity { private void findView(){ recyclerView = findViewById(R.id.recycler_view); lv_member_nodata = findViewById(R.id.lv_member_nodata); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); } @@ -114,8 +111,7 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity { @Override public void initData() { authenticationLoginAI(); - //getFactoryWorkerInfoList(); - refreshLayout.setOnRefreshListener(refreshLayout -> getFactoryWorkerInfoList()); + getFactoryWorkerInfoList(); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(ActivityFactoryWorkerInfoStatistics.this, ActivityFactoryMemberTrack.class); intent.putExtra("card_no", item.getIdNumber()); @@ -185,7 +181,6 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity { lv_member_nodata.setVisibility(View.VISIBLE); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 82385ba..48d04dd 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -29,7 +29,6 @@ import com.rehome.zhdcoa.bean.UserInfoBean import com.rehome.zhdcoa.databinding.ActivityLoginBinding import com.rehome.zhdcoa.ui.toastview.toastviewbymyself import com.rehome.zhdcoa.utils.* -import com.xiaomi.mipush.sdk.MiPushClient import com.yolanda.nohttp.NoHttp import com.yolanda.nohttp.RequestMethod import com.yolanda.nohttp.rest.Response @@ -359,11 +358,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { usernameLogin ) ) { - MiPushClient.setAlias( - context, - binding.etUsername.text.toString(), - null - ) SPUtils.put( context, Contans.SP.OLD_PWD, diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java index 94daea9..8e93c33 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SqActivity.java @@ -15,7 +15,6 @@ import com.rehome.zhdcoa.bean.ResultBean; import com.rehome.zhdcoa.bean.SqBean; import com.rehome.zhdcoa.utils.HttpUtils; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import java.util.ArrayList; import java.util.List; import retrofit2.Call; @@ -25,14 +24,13 @@ public class SqActivity extends BaseActivity { ClearEditText etSearch; RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; private List datas; private SqAdapter mAdapter; private void findView() { etSearch = findViewById(R.id.et_search); recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); + //refreshLayout = findViewById(R.id.refreshLayout); } @Override @@ -56,7 +54,7 @@ public class SqActivity extends BaseActivity { datas = new ArrayList<>(); GetData(); - refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); + //refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext())); recyclerView.setItemAnimator(new DefaultItemAnimator()); @@ -119,7 +117,7 @@ public class SqActivity extends BaseActivity { mAdapter.refresh(datas); } } - refreshLayout.finishRefresh(true); + //refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt index b2ccba4..bb070fe 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt @@ -34,7 +34,6 @@ import com.rehome.zhdcoa.utils.TimeUtils import com.rehome.zhdcoa.utils.UiUtlis import com.rehome.zhdcoa.weiget.AuditDialog import com.rehome.zhdcoa.weiget.ListYXDialog -import com.xiaomi.mipush.sdk.MiPushClient import com.yolanda.nohttp.NoHttp import com.yolanda.nohttp.RequestMethod import retrofit2.Call diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt index 7b61f04..8a72936 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt @@ -26,7 +26,6 @@ import com.rehome.zhdcoa.utils.NohttpUtils import com.rehome.zhdcoa.utils.RSAUtils import com.rehome.zhdcoa.utils.SPUtils import com.rehome.zhdcoa.utils.UiUtlis -import com.xiaomi.mipush.sdk.MiPushClient import com.yolanda.nohttp.NoHttp import com.yolanda.nohttp.RequestMethod import okhttp3.FormBody diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java index 4bc73a4..6d41386 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XfssqActivity.java @@ -12,7 +12,6 @@ import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.XfscxBean; import com.rehome.zhdcoa.utils.HttpUtils; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import java.util.ArrayList; import java.util.List; import androidx.recyclerview.widget.DefaultItemAnimator; @@ -24,12 +23,10 @@ import retrofit2.Response; public class XfssqActivity extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; private void findView() { recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); } @@ -79,7 +76,6 @@ public class XfssqActivity extends BaseActivity { public void initData() { GetData(); - refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(XfssqActivity.this, XfsinfoActivity.class); intent.putExtra("id", datas.get(position).getId()); @@ -100,7 +96,6 @@ public class XfssqActivity extends BaseActivity { mAdapter.refresh(datas); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java index 9ff3ac6..c6b9b1f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXCZCWActivity.java @@ -18,7 +18,6 @@ import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpUtils; import com.rehome.zhdcoa.weiget.ClearEditText; import com.rehome.zhdcoa.weiget.DateTimePickDialog; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -37,7 +36,6 @@ public class YXCZCWActivity extends BaseActivity { TextView tvEt; ClearEditText etSearch; RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; private List datas; @@ -46,7 +44,6 @@ public class YXCZCWActivity extends BaseActivity { private void findView() { recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); tvSt = findViewById(R.id.tv_st); tvEt = findViewById(R.id.tv_et); @@ -109,7 +106,6 @@ public class YXCZCWActivity extends BaseActivity { tvEt.setText(df.format(new Date())); GetData(); - refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(YXCZCWActivity.this, YXCZCWInfoActivity.class); intent.putExtra("id", datas.get(position).getId()); @@ -148,7 +144,6 @@ public class YXCZCWActivity extends BaseActivity { showToast("无数据"); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java index 1659faf..2257019 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJActivity.java @@ -16,7 +16,6 @@ import com.rehome.zhdcoa.entity.YxSbInfoDataBean; import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpUtils; import com.rehome.zhdcoa.weiget.ClearEditText; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -29,7 +28,6 @@ import retrofit2.Response; public class YXSBSSSJActivity extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; private List datas; @@ -39,7 +37,6 @@ public class YXSBSSSJActivity extends BaseActivity { private void findView() { recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); } @@ -85,7 +82,6 @@ public class YXSBSSSJActivity extends BaseActivity { public void initData() { initdatas = new ArrayList<>(); GetData(); - refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(YXSBSSSJActivity.this, BaseWebActivity.class); intent.putExtra("id", datas.get(position).getId()); @@ -108,7 +104,6 @@ public class YXSBSSSJActivity extends BaseActivity { initdatas.addAll(datas); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java index 497e277..0c07455 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YXSBSSSJHisActivity.java @@ -18,7 +18,6 @@ import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpUtils; import com.rehome.zhdcoa.weiget.ClearEditText; import com.rehome.zhdcoa.weiget.DateTimePickDialog; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -34,7 +33,6 @@ import retrofit2.Response; public class YXSBSSSJHisActivity extends BaseActivity { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; ClearEditText etSearch; TextView tvSt; TextView tvEt; @@ -45,7 +43,6 @@ public class YXSBSSSJHisActivity extends BaseActivity { private void findView() { recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); etSearch = findViewById(R.id.et_search); tvSt = findViewById(R.id.tv_st); tvEt = findViewById(R.id.tv_et); @@ -98,7 +95,6 @@ public class YXSBSSSJHisActivity extends BaseActivity { tvSt.setText(df.format(calendar.getTime())); tvEt.setText(df.format(new Date())); GetData(); - refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(YXSBSSSJHisActivity.this, YXSBSSSJHisInfoActivity.class); @@ -134,7 +130,6 @@ public class YXSBSSSJHisActivity extends BaseActivity { initdatas.addAll(datas); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java index 04f850e..c73fb3b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YcryglActivity.java @@ -8,8 +8,6 @@ import com.rehome.zhdcoa.base.BaseActivity; import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.bean.XfscxBean; import com.rehome.zhdcoa.utils.HttpUtils; -import com.rehome.zhdcoa.weiget.SaveOrCommitDialog; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; import java.util.ArrayList; import java.util.List; import androidx.recyclerview.widget.DefaultItemAnimator; @@ -21,7 +19,6 @@ import retrofit2.Response; public class YcryglActivity extends BaseActivity implements View.OnClickListener { RecyclerView recyclerView; - SmartRefreshLayout refreshLayout; private List datas; private XfscxDataAdapter mAdapter; @@ -29,7 +26,6 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener private void findView() { recyclerView = findViewById(R.id.recycler_view); - refreshLayout = findViewById(R.id.refreshLayout); } @@ -74,7 +70,6 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener public void initData() { GetData(); - refreshLayout.setOnRefreshListener(refreshLayout -> GetData()); mAdapter.setOnItemClickListener((itemView, item, position) -> { Intent intent = new Intent(YcryglActivity.this, XfsinfoActivity.class); intent.putExtra("id", datas.get(position).getId()); @@ -95,7 +90,6 @@ public class YcryglActivity extends BaseActivity implements View.OnClickListener mAdapter.refresh(datas); } } - refreshLayout.finishRefresh(true); } @Override diff --git a/app/src/main/res/layout/activity_factory_member_statistics.xml b/app/src/main/res/layout/activity_factory_member_statistics.xml index fc97ae8..40cb734 100644 --- a/app/src/main/res/layout/activity_factory_member_statistics.xml +++ b/app/src/main/res/layout/activity_factory_member_statistics.xml @@ -17,32 +17,25 @@ android:layout_height="match_parent" android:paddingStart="15dp" android:paddingEnd="15dp"> - - - - - - + android:background="#F2F2F2" + android:overScrollMode="never" /> + + + android:text="暂无数据" /> diff --git a/app/src/main/res/layout/activity_factory_worker_info_group.xml b/app/src/main/res/layout/activity_factory_worker_info_group.xml index 11267cb..da7fff1 100644 --- a/app/src/main/res/layout/activity_factory_worker_info_group.xml +++ b/app/src/main/res/layout/activity_factory_worker_info_group.xml @@ -8,38 +8,32 @@ - + - - - - android:overScrollMode="never" /> - + + android:text="暂无数据" /> diff --git a/app/src/main/res/layout/activity_factory_worker_info_statistics.xml b/app/src/main/res/layout/activity_factory_worker_info_statistics.xml index 6b4c091..8e3786d 100644 --- a/app/src/main/res/layout/activity_factory_worker_info_statistics.xml +++ b/app/src/main/res/layout/activity_factory_worker_info_statistics.xml @@ -13,24 +13,13 @@ - - - - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_xfssqcx.xml b/app/src/main/res/layout/activity_xfssqcx.xml index 1c26064..92e69ee 100644 --- a/app/src/main/res/layout/activity_xfssqcx.xml +++ b/app/src/main/res/layout/activity_xfssqcx.xml @@ -9,21 +9,11 @@ - - - - - + diff --git a/app/src/main/res/layout/activity_ycry.xml b/app/src/main/res/layout/activity_ycry.xml index 18ed021..8ffed99 100644 --- a/app/src/main/res/layout/activity_ycry.xml +++ b/app/src/main/res/layout/activity_ycry.xml @@ -8,21 +8,11 @@ - - - - - + diff --git a/app/src/main/res/layout/activity_yxczcwinfo.xml b/app/src/main/res/layout/activity_yxczcwinfo.xml index eb55938..a93cf46 100644 --- a/app/src/main/res/layout/activity_yxczcwinfo.xml +++ b/app/src/main/res/layout/activity_yxczcwinfo.xml @@ -36,22 +36,10 @@ android:text="点击选择结束时间" android:textSize="24px" /> - - - - - - diff --git a/app/src/main/res/layout/activity_yxczcwinfohis.xml b/app/src/main/res/layout/activity_yxczcwinfohis.xml index 0a611c9..94c050a 100644 --- a/app/src/main/res/layout/activity_yxczcwinfohis.xml +++ b/app/src/main/res/layout/activity_yxczcwinfohis.xml @@ -11,22 +11,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="10dp" /> - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_yxsbsssj.xml b/app/src/main/res/layout/activity_yxsbsssj.xml index 1c26064..c5df081 100644 --- a/app/src/main/res/layout/activity_yxsbsssj.xml +++ b/app/src/main/res/layout/activity_yxsbsssj.xml @@ -9,15 +9,6 @@ - - - - + diff --git a/app/src/main/res/layout/activity_yxsbsssjhis.xml b/app/src/main/res/layout/activity_yxsbsssjhis.xml index 420b982..71f5ba7 100644 --- a/app/src/main/res/layout/activity_yxsbsssjhis.xml +++ b/app/src/main/res/layout/activity_yxsbsssjhis.xml @@ -38,21 +38,11 @@ - - - - - + diff --git a/app/src/main/res/layout/include_refresh_head.xml b/app/src/main/res/layout/include_refresh_head.xml deleted file mode 100644 index a262b48..0000000 --- a/app/src/main/res/layout/include_refresh_head.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b7d03e..6d1288d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,7 @@ activity = "1.8.0" constraintlayout = "2.1.4" supportCompat = "28.0.0" pdfiumAndroid = "1.9.0" +annotationJvm = "1.9.1" [libraries] androidx-appcompat-v120 = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompat" } @@ -33,6 +34,7 @@ pdfium-android = { module = "com.github.barteksc:pdfium-android", version.ref = recyclerview-v7 = { module = "com.android.support:recyclerview-v7", version.ref = "supportCompat" } support-compat = { module = "com.android.support:support-compat", version.ref = "supportCompat" } support-v4 = { module = "com.android.support:support-v4", version.ref = "supportCompat" } +androidx-annotation-jvm = { group = "androidx.annotation", name = "annotation-jvm", version.ref = "annotationJvm" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } diff --git a/libs/poi-3.9-20121203.jar b/libs/poi-3.9-20121203.jar deleted file mode 100644 index 0f46288..0000000 Binary files a/libs/poi-3.9-20121203.jar and /dev/null differ diff --git a/libs/poi-scratchpad-3.9-20121203.jar b/libs/poi-scratchpad-3.9-20121203.jar deleted file mode 100644 index 1520855..0000000 Binary files a/libs/poi-scratchpad-3.9-20121203.jar and /dev/null differ diff --git a/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar b/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar index 6b5c741..7244edc 100644 Binary files a/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar and b/tkrefreshlayout/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar differ 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 6b5c741..7244edc 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