diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f535aa3..74dca20 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -35,6 +35,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -97,9 +98,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); } } }); @@ -240,7 +239,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(realPaths); + handleImageAdapter.notifyDataSetChanged(); } } }); @@ -281,7 +280,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - handleImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,7 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f535aa3..74dca20 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -35,6 +35,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -97,9 +98,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); } } }); @@ -240,7 +239,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(realPaths); + handleImageAdapter.notifyDataSetChanged(); } } }); @@ -281,7 +280,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - handleImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,7 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 2b57750..0046781 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -267,9 +267,8 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PublicToiletActivity.this, "上传中，请稍后..."); + StringHub.show(PublicToiletActivity.this, "上传中，请稍后..."); } else { - LoadingDialogHub.dismiss(); TextPaint textPaint = binding.showPictureView.getPaint(); textPaint.setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 textPaint.setAntiAlias(true);//抗锯齿 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f535aa3..74dca20 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -35,6 +35,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -97,9 +98,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); } } }); @@ -240,7 +239,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(realPaths); + handleImageAdapter.notifyDataSetChanged(); } } }); @@ -281,7 +280,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - handleImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,7 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 2b57750..0046781 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -267,9 +267,8 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PublicToiletActivity.this, "上传中，请稍后..."); + StringHub.show(PublicToiletActivity.this, "上传中，请稍后..."); } else { - LoadingDialogHub.dismiss(); TextPaint textPaint = binding.showPictureView.getPaint(); textPaint.setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 textPaint.setAntiAlias(true);//抗锯齿 diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index be0e30a..a6c9ed0 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -37,6 +37,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -123,9 +124,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BriefCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BriefCaseActivity.this, "上传中，请稍后..."); } } }); @@ -165,12 +164,13 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,7 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f535aa3..74dca20 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -35,6 +35,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -97,9 +98,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); } } }); @@ -240,7 +239,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(realPaths); + handleImageAdapter.notifyDataSetChanged(); } } }); @@ -281,7 +280,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - handleImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,7 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 2b57750..0046781 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -267,9 +267,8 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PublicToiletActivity.this, "上传中，请稍后..."); + StringHub.show(PublicToiletActivity.this, "上传中，请稍后..."); } else { - LoadingDialogHub.dismiss(); TextPaint textPaint = binding.showPictureView.getPaint(); textPaint.setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 textPaint.setAntiAlias(true);//抗锯齿 diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index be0e30a..a6c9ed0 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -37,6 +37,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -123,9 +124,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BriefCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BriefCaseActivity.this, "上传中，请稍后..."); } } }); @@ -165,12 +164,13 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,7 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index ca1f4c5..3a639fc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -34,6 +34,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -116,9 +117,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BusinessCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BusinessCaseActivity.this, "上传中，请稍后..."); } } }); @@ -136,14 +135,15 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -204,7 +204,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); @@ -240,7 +240,7 @@ StringHub.show(this, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(this, "电话号码格式不对"); return; } diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f535aa3..74dca20 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -35,6 +35,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -97,9 +98,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); } } }); @@ -240,7 +239,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(realPaths); + handleImageAdapter.notifyDataSetChanged(); } } }); @@ -281,7 +280,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - handleImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,7 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 2b57750..0046781 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -267,9 +267,8 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PublicToiletActivity.this, "上传中，请稍后..."); + StringHub.show(PublicToiletActivity.this, "上传中，请稍后..."); } else { - LoadingDialogHub.dismiss(); TextPaint textPaint = binding.showPictureView.getPaint(); textPaint.setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 textPaint.setAntiAlias(true);//抗锯齿 diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index be0e30a..a6c9ed0 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -37,6 +37,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -123,9 +124,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BriefCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BriefCaseActivity.this, "上传中，请稍后..."); } } }); @@ -165,12 +164,13 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,7 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index ca1f4c5..3a639fc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -34,6 +34,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -116,9 +117,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BusinessCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BusinessCaseActivity.this, "上传中，请稍后..."); } } }); @@ -136,14 +135,15 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -204,7 +204,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); @@ -240,7 +240,7 @@ StringHub.show(this, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(this, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 778d632..91e8238 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -156,9 +156,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CommonCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CommonCaseActivity.this, "上传中，请稍后..."); } } }); @@ -200,7 +198,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -299,7 +297,8 @@ binding.addVideoView.setLayoutParams(params); //图片九宫格 - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -628,7 +627,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index ce86a83..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index bcab432..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f70a53c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6ada5dc..b4885b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,10 +29,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - ndk { - abiFilters 'armeabi-v7a', "arm64-v8a" - } } } @@ -73,7 +69,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.6' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.10' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -112,13 +108,13 @@ //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' + implementation 'com.esri.arcgisruntime:arcgis-android:100.15.4' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //视频压缩 implementation 'com.zolad:videoslimmer:1.0.0' //问题跟踪 - implementation 'com.tencent.bugly:crashreport:3.3.92' + implementation 'com.tencent.bugly:crashreport:4.1.9.3' //ZBar扫一扫(综合Java和C++扫码) implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //定位功能 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd06ac1..374da3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -170,9 +170,10 @@ + + android:value="93496157660261fa286edb04e2a96697" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 72719ac..1deb066 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -15,7 +15,6 @@ import com.casic.dcms.R; import com.casic.dcms.model.PackageCaseBean; import com.casic.dcms.utils.StringHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import java.util.List; @@ -27,7 +26,6 @@ private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; diff --git a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java index 414a3c5..d9fa15a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/MinePageFragment.java @@ -172,9 +172,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(requireActivity(), "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(requireActivity(), "上传中，请稍后..."); } } }); diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 8ed178e..90dafdc 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -15,23 +15,19 @@ import java.util.List; public class DataBaseManager { - private static DataBaseManager instance; private DataBaseManager() { } + private static final class DataBaseManagerHolder { + static final DataBaseManager INSTANCE = new DataBaseManager(); + } + /** * 双重锁单例 */ public static DataBaseManager get() { - if (instance == null) { - synchronized (DataBaseManager.class) { - if (instance == null) { - instance = new DataBaseManager(); - } - } - } - return instance; + return DataBaseManagerHolder.INSTANCE; } private final NoticeLocaleBeanDao noticeBeanDao = BaseApplication.getDaoSession().getNoticeLocaleBeanDao(); diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 5ecf192..50db205 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -63,6 +63,14 @@ return isDigit && isLetter; } + public static boolean isPhoneNumber(String number) { + if (number.length() == 11) { + return number.matches("^1[3-9]\\d{9}"); + } else { + return false; + } + } + public static String appendCompleteURL(String url) { if (TextUtils.isEmpty(url)) { return ""; diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java deleted file mode 100644 index f39f41c..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IHttpRequestListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import okhttp3.ResponseBody; - -public interface IHttpRequestListener { - void onSuccess(ResponseBody resultBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java b/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java deleted file mode 100644 index 979a7f1..0000000 --- a/app/src/main/java/com/casic/dcms/utils/callback/IWaterMarkAddListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.utils.callback; - -import java.io.File; - -public interface IWaterMarkAddListener { - void onSuccess(File file); - - void onError(Throwable e); -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fd0349f..b371a7c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -20,7 +20,8 @@ private static final RetrofitService api = RetrofitFactory.createRetrofit( (String) SaveKeyValues.getValue(LocaleConstant.IP_KEY, "http://111.198.10.15:11409"), - RetrofitService.class + RetrofitService.class, + true ); // private static final RetrofitService shopApi = RetrofitFactory.createRetrofit( diff --git a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java index b0319d6..fd59c27 100644 --- a/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/ChangeShopInfoActivity.java @@ -35,16 +35,16 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; -import com.pengxh.androidx.lite.utils.LoadingDialogHub; import com.pengxh.androidx.lite.utils.WeakReferenceHandler; import java.io.File; import java.util.ArrayList; import java.util.List; -public class ChangeShopInfoActivity extends AndroidxBaseActivity { +public class ChangeShopInfoActivity extends AndroidxBaseActivity implements Handler.Callback { private final Context context = ChangeShopInfoActivity.this; private final ArrayList realPaths = new ArrayList<>(); //真实图片路径 @@ -89,9 +89,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(ChangeShopInfoActivity.this, "上传中，请稍后..."); } } }); @@ -111,24 +109,23 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { - weakReferenceHandler = new WeakReferenceHandler(callback); + weakReferenceHandler = new WeakReferenceHandler(this); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); shopViewModel = new ViewModelProvider(this).get(ShopViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 2, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 2023060501) { - handleSelectResult((LocalMedia) msg.obj); - } - return true; + @Override + public boolean handleMessage(@NonNull Message msg) { + if (msg.what == 2023060501) { + handleSelectResult((LocalMedia) msg.obj); } - }; + return true; + } private void handleSelectResult(LocalMedia obj) { uploadViewModel.uploadImage(this, new File(obj.getRealPath())); @@ -188,9 +185,10 @@ @Override public void onItemLongClick(@Nullable View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); + uploadViewModel.imageModel.observe(this, new Observer() { @Override public void onChanged(ActionResultBean resultBean) { @@ -198,7 +196,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -211,7 +209,7 @@ StringHub.show(context, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(context, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index 22f1db0..e8e0ca3 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -82,9 +82,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(PackageTodoDetailActivity.this, "上传中，请稍后..."); } } }); @@ -114,11 +112,11 @@ nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 - handleImageAdapter = new EditableImageAdapter(this, 2, 3); - binding.handleImageRecyclerView.setAdapter(handleImageAdapter); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, handleRealPaths, width, 3, 3); //处罚adapter - punishImageAdapter = new EditableImageAdapter(this, 2, 3); + punishImageAdapter = new EditableImageAdapter(this, punishRealPaths, width, 3, 3); binding.addPunishImageRecyclerView.setAdapter(punishImageAdapter); } @@ -173,7 +171,6 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - handleImageAdapter.setupImage(urls); binding.handleImageRecyclerView.setAdapter(handleImageAdapter); //九宫格点击事件 handleImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @@ -195,7 +192,7 @@ @Override public void onItemLongClick(View view, int position) { handleImageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); } @@ -290,7 +287,7 @@ @Override public void onItemLongClick(View view, int position) { punishImageList.remove(position); - punishImageAdapter.deleteImage(position); + punishImageAdapter.notifyDataSetChanged(); } }); uploadViewModel.imageModel.observe(this, new Observer() { @@ -302,12 +299,12 @@ //处理图片 handleImageList.add(url); handleRealPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(handleRealPaths); + handleImageAdapter.notifyDataSetChanged(); } else { //处罚图片 punishImageList.add(url); punishRealPaths.add(StringHelper.appendCompleteURL(url)); - punishImageAdapter.setupImage(punishRealPaths); + punishImageAdapter.notifyDataSetChanged(); } } } diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index 1e3ea8d..3747306 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -36,6 +36,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -96,9 +97,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CheckDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CheckDetailActivity.this, "上传中，请稍后..."); } } }); @@ -271,7 +270,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - checkImageAdapter.setupImage(realPaths); + checkImageAdapter.notifyDataSetChanged(); } } }); @@ -305,7 +304,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - checkImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + checkImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(checkImageAdapter); } @@ -362,7 +362,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - checkImageAdapter.deleteImage(position); + checkImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index f535aa3..74dca20 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -35,6 +35,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -97,9 +98,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CaseHandleDetailActivity.this, "上传中，请稍后..."); } } }); @@ -240,7 +239,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - handleImageAdapter.setupImage(realPaths); + handleImageAdapter.notifyDataSetChanged(); } } }); @@ -281,7 +280,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - handleImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + handleImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(handleImageAdapter); } @@ -345,7 +345,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - handleImageAdapter.deleteImage(position); + handleImageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index 2b57750..0046781 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -267,9 +267,8 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(PublicToiletActivity.this, "上传中，请稍后..."); + StringHub.show(PublicToiletActivity.this, "上传中，请稍后..."); } else { - LoadingDialogHub.dismiss(); TextPaint textPaint = binding.showPictureView.getPaint(); textPaint.setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 textPaint.setAntiAlias(true);//抗锯齿 diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index be0e30a..a6c9ed0 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -37,6 +37,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -123,9 +124,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BriefCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BriefCaseActivity.this, "上传中，请稍后..."); } } }); @@ -165,12 +164,13 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -327,7 +327,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index ca1f4c5..3a639fc 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -34,6 +34,7 @@ import com.pengxh.androidx.lite.adapter.EditableImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.LoadState; import com.pengxh.androidx.lite.utils.LoadingDialogHub; @@ -116,9 +117,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(BusinessCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(BusinessCaseActivity.this, "上传中，请稍后..."); } } }); @@ -136,14 +135,15 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -204,7 +204,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); @@ -240,7 +240,7 @@ StringHub.show(this, "电话号码还未填写"); return; } - if (!StringHub.isPhoneNumber(phoneNumber)) { + if (!StringHelper.isPhoneNumber(phoneNumber)) { StringHub.show(this, "电话号码格式不对"); return; } diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 778d632..91e8238 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -156,9 +156,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(CommonCaseActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(CommonCaseActivity.this, "上传中，请稍后..."); } } }); @@ -200,7 +198,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); + imageAdapter.notifyDataSetChanged(); } } }); @@ -299,7 +297,8 @@ binding.addVideoView.setLayoutParams(params); //图片九宫格 - imageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + imageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(imageAdapter); } @@ -628,7 +627,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - imageAdapter.deleteImage(position); + imageAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index a9c8723..69c9d46 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -45,6 +45,7 @@ import com.pengxh.androidx.lite.adapter.ReadOnlyImageAdapter; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.ContextHub; +import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.Constant; import com.pengxh.androidx.lite.utils.LoadState; @@ -135,9 +136,7 @@ @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { - LoadingDialogHub.show(VerifyDetailActivity.this, "上传中，请稍后..."); - } else { - LoadingDialogHub.dismiss(); + StringHub.show(VerifyDetailActivity.this, "上传中，请稍后..."); } } }); @@ -310,7 +309,7 @@ String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); - verifyImageAdapter.setupImage(realPaths); + verifyImageAdapter.notifyDataSetChanged(); } } }); @@ -344,7 +343,8 @@ operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); - verifyImageAdapter = new EditableImageAdapter(this, 2, 3); + int width = ContextHub.getScreenWidth(this) - IntHub.dp2px(this, 20); + verifyImageAdapter = new EditableImageAdapter(this, realPaths, width, 3, 3); binding.addImageRecyclerView.setAdapter(verifyImageAdapter); } @@ -490,7 +490,7 @@ @Override public void onItemLongClick(View view, int position) { imageList.remove(position); - verifyImageAdapter.deleteImage(position); + verifyImageAdapter.notifyDataSetChanged(); } });