diff --git a/app/build.gradle b/app/build.gradle index 34c4cc9..9bc6cd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,7 +100,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS diff --git a/app/build.gradle b/app/build.gradle index 34c4cc9..9bc6cd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,7 +100,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d0034ae..308ad7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,11 +20,23 @@ - - - + + + + + + + + + + + + + @@ -42,10 +54,6 @@ android:name="android.hardware.telephony" android:required="false" /> - - - - - + + + + + + + + + + + + + @@ -42,10 +54,6 @@ android:name="android.hardware.telephony" android:required="false" /> - - call) { + public void loadImage(Context context, ImageView imageView, String url, int maxWidth, int maxHeight) { if (!ActivityCompatHelper.assertValidRequest(context)) { return; } Glide.with(context) - .asBitmap() - .override(maxWidth, maxHeight) .load(url) - .into(new CustomTarget() { - @Override - public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { - call.onCall(resource); - } - - @Override - public void onLoadFailed(@Nullable Drawable errorDrawable) { - call.onCall(null); - } - - @Override - public void onLoadCleared(@Nullable Drawable placeholder) { - - } - }); + .override(maxWidth, maxHeight) + .into(imageView); } @Override diff --git a/app/build.gradle b/app/build.gradle index 34c4cc9..9bc6cd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,7 +100,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //图片选择框架 - implementation 'io.github.lucksiege:pictureselector:v3.0.4' + implementation 'io.github.lucksiege:pictureselector:v3.11.1' //视频播放器 implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.3.5-release-jitpack' //ArcGIS diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d0034ae..308ad7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,11 +20,23 @@ - - - + + + + + + + + + + + + + @@ -42,10 +54,6 @@ android:name="android.hardware.telephony" android:required="false" /> - - call) { + public void loadImage(Context context, ImageView imageView, String url, int maxWidth, int maxHeight) { if (!ActivityCompatHelper.assertValidRequest(context)) { return; } Glide.with(context) - .asBitmap() - .override(maxWidth, maxHeight) .load(url) - .into(new CustomTarget() { - @Override - public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { - call.onCall(resource); - } - - @Override - public void onLoadFailed(@Nullable Drawable errorDrawable) { - call.onCall(null); - } - - @Override - public void onLoadCleared(@Nullable Drawable placeholder) { - - } - }); + .override(maxWidth, maxHeight) + .into(imageView); } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index ca0a8fa..6a75200 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -9,11 +9,18 @@ public class LocaleConstant { public static final String[] USER_PERMISSIONS = { - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, - Manifest.permission.READ_PHONE_STATE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.RECORD_AUDIO, Manifest.permission.CALL_PHONE + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.RECORD_AUDIO, + Manifest.permission.CALL_PHONE, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.READ_MEDIA_VIDEO, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE }; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; public static final String[] DEPT_PAGE_TITLES = {"待办案卷", "待处理", "部门调整批示", "二级缓办待处理", "部门授权审核", "二级延期待处理", "已办案卷"};