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 cd5f1bd..e334d32 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 632ed5b..e100c11 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 fba1dd1..252684c 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 b219f76..6bc4743 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 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/debug/packageDebugResources/compile-file-map.properties b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 3ed64d1..631d465 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 @@ -#Sat Oct 12 15:23:48 CST 2024 -com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_bottom.xml=C\:\\Users\\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=C\:\\Users\\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=C\:\\Users\\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=C\:\\Users\\admin\\AndroidStudioProjects\\ZHDCOA\\androidpdfviewer\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\default_scroll_handle_top.xml +#Fri Nov 01 11:28:51 GMT+08:00 2024 +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 diff --git a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/merger.xml index bbf45ce..28e9f0c 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 2c6c0b9..000c800 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 617170f..fae6518 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 e4e2534..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 bb0edcf..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/packageDebugAssets/merger.xml b/androidpdfviewer/build/intermediates/incremental/packageDebugAssets/merger.xml index 74cb3f6..71268bd 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 4dc8798..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 815756c..4f7b619 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 Sep 28 12:10:20 CST 2024 -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 +#Thu Nov 07 17:48:18 GMT+08:00 2024 +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..ac0dc55 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 25125e2..9a35050 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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\AndroidManifest.xml:2:1-4:12 -INJECTED from C:\Users\admin\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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml xmlns:android - ADDED from C:\Users\admin\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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\AndroidManifest.xml -INJECTED from C:\Users\admin\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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidpdfviewer\src\main\AndroidManifest.xml + INJECTED from /home/admin/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 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/compileDebugJavaWithJavac/previous-compilation-data.bin b/androidpdfviewer/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 4829a14..e96404a 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 e54a337..99e02ff 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 4a4b7d5..2a23c98 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 @@ -#Sat Oct 12 15:23:50 CST 2024 +#Fri Nov 01 11:28:52 GMT+08:00 2024 diff --git a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 81fe29c..9d8c593 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 d330de6..f1bb334 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 36c1440..0f60cf4 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 d50a656..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 af129eb..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/packageDebugAssets/merger.xml b/androidslantedtextview/build/intermediates/incremental/packageDebugAssets/merger.xml index 687b070..231b2fa 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 0fb7c35..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 5947800..9f37064 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 Sep 28 12:10:22 CST 2024 +#Thu Nov 07 17:48:20 GMT+08:00 2024 diff --git a/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/androidslantedtextview/build/intermediates/incremental/release/packageReleaseResources/merger.xml index 9837aae..6a8e746 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 a96f1fe..1c68210 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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidslantedtextview\src\main\AndroidManifest.xml:1:1-3:12 -INJECTED from C:\Users\admin\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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidslantedtextview\src\main\AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml xmlns:android - ADDED from C:\Users\admin\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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidslantedtextview\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidslantedtextview\src\main\AndroidManifest.xml -INJECTED from C:\Users\admin\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 C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidslantedtextview\src\main\AndroidManifest.xml + INJECTED from /home/admin/AndroidStudioProjects/ZHDCOA/androidslantedtextview/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from C:\Users\admin\AndroidStudioProjects\ZHDCOA\androidslantedtextview\src\main\AndroidManifest.xml + INJECTED from /home/admin/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 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/androidslantedtextview/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin b/androidslantedtextview/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin index 0088a45..9f18803 100644 Binary files a/androidslantedtextview/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin and b/androidslantedtextview/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/build.gradle b/app/build.gradle index 7b0afa7..d5ff98a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 34 - versionCode 16 - versionName "2.3.2" + versionCode 17 + versionName "2.3.3" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 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 ea19c94..f51833b 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 @@ -170,13 +170,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") - - binding.etUsername.setText("310353") - binding.etPassword.setText("Zhps1382.") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") +// +// binding.etUsername.setText("310353") +// binding.etPassword.setText("Zhps1382.") +// binding.etUsername.setText("310691") +// binding.etPassword.setText("Abcd*1234") // binding.etUsername.setText("990001") // binding.etPassword.setText("Bwfb@123") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt index 2a331b5..c826e1c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt @@ -7,7 +7,6 @@ import android.content.pm.PackageManager import android.graphics.Color import android.os.Build import android.text.TextUtils -import android.util.Log import android.view.Gravity import android.view.KeyEvent import android.view.View @@ -77,10 +76,14 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { // }else{ // Log.i("app", "token is null") // } - //当选择外网时才会开启一键招回 + + + //当选择外网时才会开启一键招回 if (Contans.BASE_URL.equals(Contans.BASE_URL_EXTRANET)) { - initMqtt() + if (NetworkUtil.canNetWorkConnect(context)&&NetworkUtil.isISPNetWorkConnect(context)) { + initMqtt() + } } initTbs() initToolbar("首页") @@ -259,20 +262,22 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { getAboutMeData() badgeView_me.badgeCount = AllNum if (Contans.BASE_URL.equals(Contans.BASE_URL_EXTRANET)) { - if (mqttPublishServer == null) { - mqttPublishServer = MqttSSLPublishServer(context) - } - if (timer == null) { - try { - timer = Timer() - timer!!.schedule(object : TimerTask() { - override fun run() { - mqttPublishServer!!.start() - } - }, 1000, 60000) - // 设定指定的时间time,此处为10000毫秒 - } catch (e: Exception) { - e.printStackTrace() + if (NetworkUtil.canNetWorkConnect(context)&&NetworkUtil.isISPNetWorkConnect(context)) { + if (mqttPublishServer == null) { + mqttPublishServer = MqttSSLPublishServer(context) + } + if (timer == null) { + try { + timer = Timer() + timer!!.schedule(object : TimerTask() { + override fun run() { + mqttPublishServer!!.start() + } + }, 1000, 60000) + // 设定指定的时间time,此处为10000毫秒 + } catch (e: Exception) { + e.printStackTrace() + } } } } @@ -352,6 +357,23 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { timer!!.schedule(object : TimerTask() { override fun run() { mqttPublishServer!!.start() +// if (NetworkUtil.canNetWorkConnect(context)) { +// showLog("canNetWorkConnect") +// }else{ +// showLog("no NetWorkConnect") +// } +// +// if (NetworkUtil.isWifiNetWorkConnect(context)) { +// showLog("isWifiNetWorkConnect") +// }else{ +// showLog("no isWifiNetWorkConnect") +// } +// +// if (NetworkUtil.isISPNetWorkConnect(context)) { +// showLog("isISPNetWorkConnect") +// }else{ +// showLog("no isISPNetWorkConnect") +// } } }, 1000, 60000) // 设定指定的时间time,此处为10000毫秒 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListReportActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListReportActivity.kt index b68e09d..2d99a9a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListReportActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListReportActivity.kt @@ -63,31 +63,39 @@ class WorkRiskListReportActivity : BaseActivityOaToolbarViewBinding @@ -107,11 +115,11 @@ class WorkRiskListReportActivity : BaseActivityOaToolbarViewBinding val dialog = RiskDatePickDialog( - context, calendarSunday + context, calendarToday ) { outPutDate: String?,calendarBack: Calendar? -> etime = binding.tvEt.getText().toString().trim { it <= ' ' } binding.tvEt.text = outPutDate - calendarSunday = calendarBack; + calendarToday = calendarBack; authenticationLoginAI() } dialog.show() diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 3127b60..320561d 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -118,17 +118,17 @@ class HomeFragment : BaseViewBindingFragment() { launcherResultAUDIT = createActivityResultLauncherAUDIT() - showLog(GridViewDialog.TAG_AF) + //showLog(GridViewDialog.TAG_AF) var results: Array = App.getInstance().userInfo.permissionsResult.split(";".toRegex()) .dropLastWhile { it.isEmpty() } .toTypedArray() - for (result in results) { - showLog("---------------->>>>") - showLog(result) - } +// for (result in results) { +// showLog("---------------->>>>") +// showLog(result) +// } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java b/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java index 9bd27ca..469f6e3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/MqttSSLPublishServer.java @@ -15,6 +15,7 @@ import android.text.TextUtils; import android.util.Log; import com.google.gson.Gson; +import com.rehome.zhdcoa.App; import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.bean.LoginCommitBean; @@ -164,6 +165,7 @@ public class MqttSSLPublishServer { mapPush.put("sysversion", rowsBean.getSysversion()); mapPush.put("username", rowsBean.getUsername()); mapPush.put("password", rowsBean.getPassword()); + mapPush.put("name", App.getInstance().getUserInfo().getUsernames()); } } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NetworkUtil.java b/app/src/main/java/com/rehome/zhdcoa/utils/NetworkUtil.java new file mode 100644 index 0000000..821b575 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/utils/NetworkUtil.java @@ -0,0 +1,97 @@ +package com.rehome.zhdcoa.utils; + + +import android.content.Context; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; + +/** + * Create By HuangWenFei + * 创建日期：2023-05-18 16:06 + * 描述： + */ +public class NetworkUtil { + + private NetworkUtil() {} + + /** + * 当前是否有网络状态 + * + * @param context 上下文 + * @param needWifi 是否需要wifi网络 + */ + public static boolean hasNetWorkStatus(Context context, boolean needWifi) { + NetworkInfo info = getActiveNetwork(context); + if (info == null) { + return false; + } + if (!needWifi) { + return info.isAvailable(); + } else if (info.getType() == ConnectivityManager.TYPE_WIFI) { + return info.isAvailable(); + } + return false; + } + + /** + * 当前网络是否连接wifi状态 + * + * @param context 上下文 + */ + public static boolean isWifiNetWorkConnect(Context context) { + NetworkInfo info = getActiveNetwork(context); + if (info == null) { + return false; + } + if (info.getType() == ConnectivityManager.TYPE_WIFI) { + return info.isAvailable(); + } + return false; + } + + /** + * 当前网络是否连接的运营商网络 + * + * @param context 上下文 + */ + public static boolean isISPNetWorkConnect(Context context) { + NetworkInfo info = getActiveNetwork(context); + if (info == null) { + return false; + } + if (info.getType() == ConnectivityManager.TYPE_WIFI) { + + }else{ + return true; + } + return false; + } + + /** + * 当前是否有网络连接 + * @param context 上下文 + */ + public static boolean canNetWorkConnect(Context context) { + NetworkInfo info = getActiveNetwork(context); + if (info == null) { + return false; + } + return true; + } + + /** + * 获取活动网络连接信息 + * + * @param context 上下文 + * @return NetworkInfo + */ + public static NetworkInfo getActiveNetwork(Context context) { + ConnectivityManager mConnMgr = (ConnectivityManager) context + .getSystemService(Context.CONNECTIVITY_SERVICE); + if (mConnMgr == null) { + return null; + } + // 获取活动网络连接信息 + return mConnMgr.getActiveNetworkInfo(); + } +} 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 71da25e..53faa74 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 71da25e..53faa74 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