From 2590f5d4d8609088ca3e1e6985a36c9cdc7b0355 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 8 Nov 2024 14:02:36 +0800 Subject: [PATCH] 2.3.3 release --- ...able_default_scroll_handle_bottom.xml.flat | Bin 800 -> 796 bytes ...awable_default_scroll_handle_left.xml.flat | Bin 628 -> 624 bytes ...wable_default_scroll_handle_right.xml.flat | Bin 800 -> 796 bytes ...rawable_default_scroll_handle_top.xml.flat | Bin 628 -> 624 bytes ...able_default_scroll_handle_bottom.xml.flat | Bin 800 -> 800 bytes ...awable_default_scroll_handle_left.xml.flat | Bin 628 -> 628 bytes ...wable_default_scroll_handle_right.xml.flat | Bin 800 -> 800 bytes ...rawable_default_scroll_handle_top.xml.flat | Bin 628 -> 628 bytes .../compile-file-map.properties | 10 +- .../debug/packageDebugResources/merger.xml | 4 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../mergeReleaseJniLibFolders/merger.xml | 2 +- .../mergeReleaseShaders/merger.xml | 2 +- .../incremental/packageDebugAssets/merger.xml | 2 +- .../packageReleaseAssets/merger.xml | 2 +- .../compile-file-map.properties | 10 +- .../packageReleaseResources/merger.xml | 4 +- .../logs/manifest-merger-debug-report.txt | 18 ++-- .../logs/manifest-merger-release-report.txt | 18 ++-- .../previous-compilation-data.bin | Bin 9583 -> 9583 bytes .../previous-compilation-data.bin | Bin 9585 -> 9583 bytes .../compile-file-map.properties | 2 +- .../debug/packageDebugResources/merger.xml | 4 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../mergeReleaseJniLibFolders/merger.xml | 2 +- .../mergeReleaseShaders/merger.xml | 2 +- .../incremental/packageDebugAssets/merger.xml | 2 +- .../packageReleaseAssets/merger.xml | 2 +- .../compile-file-map.properties | 2 +- .../packageReleaseResources/merger.xml | 4 +- .../logs/manifest-merger-debug-report.txt | 18 ++-- .../logs/manifest-merger-release-report.txt | 18 ++-- .../previous-compilation-data.bin | Bin 743 -> 743 bytes app/build.gradle | 4 +- .../zhdcoa/ui/activity/LoginActivity.kt | 12 ++- .../rehome/zhdcoa/ui/activity/MainActivity.kt | 56 +++++++--- .../ui/activity/WorkRiskListReportActivity.kt | 62 ++++++----- .../rehome/zhdcoa/ui/fragment/HomeFragment.kt | 10 +- .../zhdcoa/utils/MqttSSLPublishServer.java | 2 + .../com/rehome/zhdcoa/utils/NetworkUtil.java | 97 ++++++++++++++++++ .../bundleLibRuntimeToJarDebug/classes.jar | Bin 226009 -> 226159 bytes .../bundleLibRuntimeToJarRelease/classes.jar | Bin 226009 -> 226159 bytes 44 files changed, 255 insertions(+), 124 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/utils/NetworkUtil.java 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 cd5f1bdd66fcbfa3221eaf667e6e2ed0e61f5769..e334d3248d7b5e09ae24dd25255330e51a7a0330 100644 GIT binary patch delta 150 zcmZ3$Hiu2p(J>%|k%55$hFO?_93VJ1QPP}m0i%9Ker~FMVoGjip8mu{(J=ie4;N>D zNBzXSl%o91l!BDBvdq--)FS<)(#)I`{mi_Q)S}$fl+47E)MEXD#N_P6^wgC2A|NLv iHK{ZmCgcL*1f>?|mlh=h%|k%55$hB=sl93Z$jQPRAAF{86pOlWaxQE^OSN^WLejALF(QGRAh za7k%OW`00XepYI7NpVb+hl{hnV@x7MvLGd`EHkw{wJ0X3G&3h9CNr-jwJ0|=B{Q)k zwK%3AF*!RiJvAl12*^oEO)5=?3AuncL8-<0rA5ggxuQh2^2DT^)R>9-G85miZTzgs F1OV-2J%9iJ 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 632ed5b9ee8148e739e622abee67fb908b720b12..e100c11a8350dbee436ae7a5352d250c2ac8aafe 100644 GIT binary patch delta 155 zcmeyu@_|Lt(J>%|k%55$h9j7O93VI~QPPxe9;1Fner~FMVoGjip8mvm(J=ie4;N>D zNBzXSl%o91l!BDBvdq--)FS<)(#)I`{mi_Q)S}$fl+47E)MEXD#N_P6^wgC2A|NLv nHK{ZmCgcL*1f>?|mlh=h%|k%55$hGUq393VJ5QPMPRA)~WZOlWaxQE^OSN^WLejALF(QGRAh za7k%OW`00XepYI7NpVb+hl{hnV@x7MvLGd`EHkw{wJ0X3G&3h9CNr-jwJ0|=B{Q)k uwK%3AF*!RiJvAl12*^oEO)5=~nYdAuD<-8Vu{<#;CpBi`1%-|88yNw(!Zx-5 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 fba1dd150ec2e0be9c67d7694a7126b4d9300463..252684c1edf56ac917b6cc46c3b1bfcce162cc1b 100644 GIT binary patch delta 150 zcmZ3$Hiu2p(J>%|k%55$hFO?_93VI|QPPZWKBIm{er~FMVoGjip8muH(J=ie4;N>D zNBzXSl%o91l!BDBvdq--)FS<)(#)I`{mi_Q)S}$fl+47E)MEXD#N_P6^wgC2A|NLv iHK{ZmCgcL*1f>?|mlh=h%|k%55$hB=sl93VJ9QPQk_5u>wJOlWaxQE^OSN^WLejALF(QGRAh za7k%OW`00XepYI7NpVb+hl{hnV@x7MvLGd`EHkw{wJ0X3G&3h9CNr-jwJ0|=B{Q)k zwK%3AF*!RiJvAl12*^oEO)5=?3AuncL8-<0rA5ggxuQh2^2DT^)R>7E%|k%55$h9j7O93VI`QPQM-E~9=%er~FMVoGjip1xyVN>P4hN^nVO zN@jjQQGQlxa!Ij%l!uG6zoUL4M6w_ytt>OOJhezasWdYuML#pIB(*3vH6=5#B(+$- zATc>RF+DXUz6i)kNlhwEhY7iWI6%|k%55$hGUq393VJ7QPL!B0i&~3OlWaxQE^OSN^WLejALF(QGRAh za7k%OW`00XepYI7NpVb+hl{hnV@x7MvLGd`EHkw{wJ0X3G&3h9CNr-jwJ0|=B{Q)k wwK%3AF*!RiJvAl12*^oEO)5=~nYcleD<-8Vu{<#;CpBi`d09q=jc-~Q0UyaWt^fc4 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 5ac2e4df29506afbf96d4495b743d03a7993449b..22bb4cbf59a9b3620eada22c752460c978c39b14 100644 GIT binary patch delta 21 ccmZ3$wt#IyFjq!?ZmND_N^WM}#@NG508?%U?f?J) delta 21 ccmZ3$wt#IyFjr`CYEiL%YD!}M#@NG508>i`=Kufz 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 876967f6a6e1c4b44ce6aba9e9caa334c3442e36..68c5c5fa311fab50b07909f7675e8c06ed3b530f 100644 GIT binary patch delta 21 ccmeyu@`YtWAXi3yZmND_N^WM}#%M_<0A9!k_+yDRo 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 4829a14fb6ac8e114c77f97617c12da27e2de786..e96404a7972cb791d4c860a441c8aafdc106dc6b 100644 GIT binary patch delta 2532 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 diff --git a/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin b/androidpdfviewer/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin index e54a3379b16442fe4fdc3006967d3921dc9d2314..99e02ffea95e6df8200a3a93df5f6be66becc2c9 100644 GIT binary patch delta 2530 zcmX|CYg80R7Oq=Ow-`ofiNWZ^2QVUXbQA<7#?_1rBg&xQfDghsIkPyzM3{l55yy@} zUOOZXENOXfQbOb?BiMkqbeWK!?C?rwiMmO0tx=~k+S#@tSkU#afb#K*o@Ap;J zFS8%cZk!8=h6xM9brA^@4gQg&!eP(0%66wCij-L$)(o4Z(L{<#7l&=!vEY2{owR*l z?P&e+;iQJZ zNQop_UB2Q+Q5_TaKCSJ9Yb}~3=gF2-%LgW!#6uZY z|NPQt8}FI--urK0bWoOUxhrOcPMQC)X{GU#M1PG&Q;6Hx3N)*LwQ<9}R)b{)^Y)sU zo;yhFJ}JlVS+n>C|K7#g`nY_pBF?c*xccI#l=-zacjc4#vm-0OvKEZA5=gl-JwMy# zkbT83e|&V&yzJ)_oBwd))MT%e=T%_-6q4hmByr`=9qm~^-1)n?JLwqrTCaP`*?@n(x;P~~}(@|q?Pq}cro*DTtwu&DHE7(?k=$o-Sz_b(Q>;lu&wB108 zobn!~7lwp3fMGABhVKJX>~v;FiuPA$yt1A=@*45Cv<*+E?Eb_J=KU})zLDMHhk7@G z`2fVuZf3{%A#A1)1Pc2|7y)T)t&lma8InXf#9o$G^|~`PB2)@{K5EKoh-(LPDdaN0 zenX&2&BZ3lP_NaQYuR}Yqqbrx1ci2TzX^Dl3O>@95sW?{dc(`7-Y4?^cNSwS}+#EOBBy_ZozVNaxvS`a&o!yY~ z4VZ$`n8rJ8xFW(~Aa}uZ4-#*~KM|_a?vOP=8$iaaOTB}!-QzuGYy{T;*I_&f0RqY7 zU7&|Sq>3Lg0Ek{n4FntmG85<-(9#a}+B+1(Li>kLceMd|3G-ip{x#_Dz$!{gmZ>r- z1PB3{tfn!yVGSjvR>v}H9uTTr0TKbAc;WeY9INdgo>2*!DvHW+F3q+|OI0U?Yy~Pu zaEdF0d`eBXKm(j2YlRjt)L=pmk*uSp_0&>L^&67ca5rXV+6yql70a-X0jf zh@%?51+tmqmNEmMz+r_r3Ly%3H-KM2E0VAp#&3uIMIgJh5p258@Il^0IR~!Z$SUXo z$Z~xGkpt!v^rlSKd2B#L0IgRG+Ryrg6)I}x^HNf~Ap}pX!34EbK^klOytP1QDqIJ= zeFn&S3RJ09X~(i0qvqo@`2;n#(7$3X&ip@S*`y>DF=^@xcJ~cV(%4fp;T3$Pda92k z^2}F3tqJ5dOzbpGD5mXL2%Bu}<@PXum#h`5u`Z;wr|vG&2FRaU-ZRu(Oml%^{wkXe zc37iN?^EX~)w_qD(|A16qcYW@W(JtUWjfj8&FJFeh<5bBNRTl zO3j_raEDk@9rOnS~sx2Soa*@7)5w=m1P^wOScMHgP?N z6yeOp>iwqrqiq{E&tKDHMxrp{v0u1%1R;m8Kr$OEM$bl{23$c~183RG>FPMmK8}>g zt}IpYgtXuyqH%Kx`#D1+r*Go)N9h5?B-!#b1EK)Bv1X4{-7&WqFkP)sGiPeyj0ZVW z9d`(~%CctUb;6$!9B$Xj84hzZj&PR8aFipZIaVpp*2a-Cr!&iDbu41sK)ssLITb7+ z*FDI(R9Uf^19iS=qlkt;!fxwbg}Daqf+!Z`e;Ep!ANkhGTxouFu+!kz_QX~i0T7^HqD zg+cE^GdmJAuD_JziK=1`gTnC}2@DP^Y=mB;8=ms|XMD_depHVa7dWX4p7Z)&`NS8z zX*-{h=?S*|#_Rvb$Gzk&UHmw`$7X%S>tFM+s|3?(Va^)C)W+ktxCh?%tky%3pf46I zC4!|?nC0d#!lgd^=iY)cL0>LdDg=|8PwUMpmE8)Cfesd|3sb-3xw^N5a-}@aW{x^R z|G8kG7H(0Y1N}`aoq=a-O~m=OmSoFL6E(?SJwp g_hcB_Wt_i6-m!C|O0lc+NM{#zMYtV4k0^ux1Gr`Ew*UYD delta 2466 zcmX|CeOOc189(p2xz{KuT$$BssuGB(RHLA&sk+uk2vmXv!`Cd&_GB0#6>c!eRgubv zd5sg za^*XGF1KVNYaEgz$LY~%W{4@>qc`u#I2(5}>%bR#+P}ZY8sML4MzLq*J$HP zqjg2Zzn=Qi?CDmTK`LB%&S3Fy#--!nyQaQc>u0W|2yd z$59w8zGpl)ZU3Wf7vN%>X7O3Fon51IAd8LVe)G#DcXELxbSbIuIC4Cs(j{f*n#9ob zs>hpe+xFl7ug(;n=Um~9_37pGW!B}E70IC*jiwNzJC|!#vfJF4VMTH8r>?Ta7NbmB zQbNid1*O31xDl!{u=|)=H7&k)n0V!cFLB@MMVI+m-P?92$XZ#P@0{BE^pBq0uN+HP zJxn|uRs*)RkeXPMBCcxOb29I{n}4-kN$KETXfkWTz78yOJodEq?`Ea^Xz;Ne{3yY;2jb>6GJ`Nu-2}G1upn_C(+H!C z&0yXS3#T6dQsH*z&k$YDPpR@AK2VMQOV*}GGxrv^K-?!_JqYs;fpvDqVIbvhUn}e4 zN3wV!9Ax&MFcvb{S|N9IBczDFNY|RIbuTU~jG5qxdNOWiCnTH%TNMgQ_MHb(`o0{`PW~bnVcay^t{K0;=74i<}?u4FBP zCdEugGMROU=;`}49o5pkjruKnxA#HvRFAkdVZ2p1cXE8!vxe#A+h4wL1=79-Yj_6J zsI$h%A{+y93#_*x`8xa^Q*pZ_p9W|%NQk;h9f9LM^~6a=t{E;t42c8+spJiy$3UcV z2r&bQD!CqpcL0e8dJ43(m%UI=K(`5lqu=r#2l5QkpM&8A7;Zu-C6&t*8WjRWf<($_ z>~&a8NtHud=I{cc@);mT09l3cF&x`AI67xNXx33u?RGE8cX*a4Mwqe#sAS}1ZzNey zt>1zMI9bvPZD6iPKt&?iK&>08y^b0-QA0J=Yr+tdq~*}{Lj*~IF9%sFs)IqK7P`?T zEt5?hV#$_>6JRH((9Vm7E{vu?_>iXVpynsA8MXjs2X#P-03@y)Isw&~Imko;@Z!`! z%^y+Q9Z1)gn+6sqXx!&C={bC%SSl}FDQfr{h~Ea%aYWYcFP)bh15im?u?`DK zI%!e`JxNK0)92{#>~X+ODTO>mZ56Z_C>B8JTM=v57_tX=__=bJA8IE?!A2-;I`gxz zht9nY=P?nNFW*ssLRk zT=%n{D7lh8YPmwKU(@6#a8==~C)=5q@eL(wo!)GZtH9^>07ufW#3Tf71tG)zqYea& zF7<(S3hQ`j`~*3YkiXH`@2I|qYHlgDk`}vi{H9ZYs|THykQgNmO>h!6aAEMo5!h@k zdZpr}AtcS8OD2x&_rVi!>)uvmD{94ct*YAkUHG?SkK7N;114hT-=`hZ>Y*yOlf$xfBT6r!a z8QOTm5#D~3x3uu$*T2lmf+_XFxw3W1Vf8p`$Vu@ - + @@ -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 0088a451274d50dd5c17e9066a0ca1d38a488139..9f18803181376b7f803d997db8a7f8893c1dcfd5 100644 GIT binary patch delta 24 gcmaFP`kZwGKNC-$>52yF2j{1z-N-pNS(@n#0Dm|N!~g&Q delta 24 gcmaFP`kZwGKNC;djhu7R56(}`GhNXzS(@n#0ED0l!~g&Q 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 71da25ea9aea91c0035796fdcdcd0bbfa078344f..53faa74c4851e84b9b6998d8e19c8aa1eaed8ee6 100644 GIT binary patch delta 1359 zcmZ9LeQZ-z7{+_fi!Eha*8%~u8hQ(ZZJjpVNH*rARx?P(U|H9Xb)W5kwPo$vwN5da zTS|xl6O_SSd=17?m_d`F8#W?r&hvYp z=bZO^+?(?S_wE!-X_-10j}P=DPnwMv7hW=5`mXHs`(jkEii^VPOBaO4v>0p!z3Af` zkECagrf1ld^bG%UV1<;zgcD4-!wEVZb3z#oIKjeP*xd|f%s9c$#+9+q3=Xy=jXk`U zW5Ntu@m4cf_z)KjRzaN9tVO#ED%oXBxS#9e zuQrq3g#Hp%h<81(4tIDcHC;@!8b>_jNN$xAvz7Uh!Nxx;m9=BrI&AWip0A@!?jjyyo1^>e?*V23Pa6C#2ZSc`T8+K;lDsik)gD?6hRNWx6 zZ+2?&u8$V*4v?n4T3qEONJm@5-p0eN5aPZ$v10B?4E2K^tJ;V! zptB8n_|3nFm*5X=@D$sPrgnIiKUj@IJ3Ni~YnT>qwbROfu2)Dy2lczlq=G8J!?dW$jbVDE49miBR zq*xl+K6oCspJ!NcjWuH6JoWqaKCr;-#Vp#rA1dJLM_Dy3sg`T93S;;HId6ZGtz|B= z6}WH!Z1BjBGTMuw9%|02M?(~G5C#X|(y?6D<4l+q?cKjjbhzsv1)`B0G8Cbi>0&JW zN-_sO+Dpco!5nf_BDF_y$ODN)U(O+&5h7hVw?{Vj+3p$JYJLF_I!iD|6?KkX-9ujyZ)#x4Og*lz+gUYCBOngj)2H~&|kNW9TmLo&Y@yJUbM8S(a^jJSDu-t%@)`=#gqd;ZVm zy`1y=g8s*O{dgL~VG~m(J{h z|FnV;c@y>gyyAWU8=9bqk5;bgFNJ=1kEYeiEm+b_9d=bGbS_?Krnu@&_-$zMQT*r; zP1lxZ<1rs(<2@fW>4=FPv_}eO_4sTH6!WZ^HSnPTqw{MZr~QBFo}$t*gEX-lkt;{N%)qZj9^V7-hD)_Z%ras1u<=tq%Z(3zECN| zPPExsI(`tKW#&{#GG0Ynf4PNruXI0H*j}vL56AhxHLLzKG^;d3nJUN=IIYqxI<3+P zgu4XUjfN0Q#h8aGWVO-O{Lmxt3;d&_;=crAZBWLqox<0HP>SklX2b4w%HDTol^F15 zJ9UVk7o-LQK`3HpaX1J={Kd~CYww_u%~zy&b%mL6rGrvNzLvx`PkUAK4NJjaf;30u zIhy0ESrMzoLv#1BsS_-)WZ*c|0*_+U%B?tT3@8 zB1k0`{WSmK@c&9U!qN~8lc739T?hLmnFvw-@?j}9he@m)!`d)(amUF-&PmGoD@-~5 z*CYva!wzmbBgM6D$~iG2#iqA;8de-6Z~1$YoI6P2OP7RjqP_uBoS__1#`NryK?36#1!?eW#a>rfCz}2IyF8`shPpw@UG=6%_omkHQVPg6zPD u`k|Oz#JYayyE>@Sx&gX4-{lLu>j96>qZ`|z)0u05M*9z+a=9e{ 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 71da25ea9aea91c0035796fdcdcd0bbfa078344f..53faa74c4851e84b9b6998d8e19c8aa1eaed8ee6 100644 GIT binary patch delta 1359 zcmZ9LeQZ-z7{+_fi!Eha*8%~u8hQ(ZZJjpVNH*rARx?P(U|H9Xb)W5kwPo$vwN5da zTS|xl6O_SSd=17?m_d`F8#W?r&hvYp z=bZO^+?(?S_wE!-X_-10j}P=DPnwMv7hW=5`mXHs`(jkEii^VPOBaO4v>0p!z3Af` zkECagrf1ld^bG%UV1<;zgcD4-!wEVZb3z#oIKjeP*xd|f%s9c$#+9+q3=Xy=jXk`U zW5Ntu@m4cf_z)KjRzaN9tVO#ED%oXBxS#9e zuQrq3g#Hp%h<81(4tIDcHC;@!8b>_jNN$xAvz7Uh!Nxx;m9=BrI&AWip0A@!?jjyyo1^>e?*V23Pa6C#2ZSc`T8+K;lDsik)gD?6hRNWx6 zZ+2?&u8$V*4v?n4T3qEONJm@5-p0eN5aPZ$v10B?4E2K^tJ;V! zptB8n_|3nFm*5X=@D$sPrgnIiKUj@IJ3Ni~YnT>qwbROfu2)Dy2lczlq=G8J!?dW$jbVDE49miBR zq*xl+K6oCspJ!NcjWuH6JoWqaKCr;-#Vp#rA1dJLM_Dy3sg`T93S;;HId6ZGtz|B= z6}WH!Z1BjBGTMuw9%|02M?(~G5C#X|(y?6D<4l+q?cKjjbhzsv1)`B0G8Cbi>0&JW zN-_sO+Dpco!5nf_BDF_y$ODN)U(O+&5h7hVw?{Vj+3p$JYJLF_I!iD|6?KkX-9ujyZ)#x4Og*lz+gUYCBOngj)2H~&|kNW9TmLo&Y@yJUbM8S(a^jJSDu-t%@)`=#gqd;ZVm zy`1y=g8s*O{dgL~VG~m(J{h z|FnV;c@y>gyyAWU8=9bqk5;bgFNJ=1kEYeiEm+b_9d=bGbS_?Krnu@&_-$zMQT*r; zP1lxZ<1rs(<2@fW>4=FPv_}eO_4sTH6!WZ^HSnPTqw{MZr~QBFo}$t*gEX-lkt;{N%)qZj9^V7-hD)_Z%ras1u<=tq%Z(3zECN| zPPExsI(`tKW#&{#GG0Ynf4PNruXI0H*j}vL56AhxHLLzKG^;d3nJUN=IIYqxI<3+P zgu4XUjfN0Q#h8aGWVO-O{Lmxt3;d&_;=crAZBWLqox<0HP>SklX2b4w%HDTol^F15 zJ9UVk7o-LQK`3HpaX1J={Kd~CYww_u%~zy&b%mL6rGrvNzLvx`PkUAK4NJjaf;30u zIhy0ESrMzoLv#1BsS_-)WZ*c|0*_+U%B?tT3@8 zB1k0`{WSmK@c&9U!qN~8lc739T?hLmnFvw-@?j}9he@m)!`d)(amUF-&PmGoD@-~5 z*CYva!wzmbBgM6D$~iG2#iqA;8de-6Z~1$YoI6P2OP7RjqP_uBoS__1#`NryK?36#1!?eW#a>rfCz}2IyF8`shPpw@UG=6%_omkHQVPg6zPD u`k|Oz#JYayyE>@Sx&gX4-{lLu>j96>qZ`|z)0u05M*9z+a=9e{