diff --git a/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt b/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt index 3bcdb7ca7..fd459b0e3 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt @@ -205,8 +205,8 @@ class CreatePrivilegeCardDialog : BaseDialog() this, canChooseGif = true, resultCode = REQUEST_CODE_OPEN_PHOTO_PROVIDER, - maxFileSize = 1024 * 1024 * 20, - videoMaxSecond = 15, +// maxFileSize = 1024 * 1024 * 20, +// videoMaxSecond = 15, showVideoType = "mp4" ) } @@ -484,6 +484,14 @@ class CreatePrivilegeCardDialog : BaseDialog() val path = photo.path Log.d(TAG, "onPhotoResult path:$path") if (path.endsWith("mp4") || photo.type.endsWith(Type.VIDEO)) { + if (photo.duration > 15 * 1000) { + SingleToastUtil.showToast("视频时长不能超过15秒") + return + } + if (photo.size > (1024 * 1024 * 20)) { + SingleToastUtil.showToast("上传文件最大不能超过20M") + return + } uploadVideo(photo) } else if (photo.path.endsWith(Type.GIF) || photo.type.endsWith(Type.GIF)) { uploadGif(path) diff --git a/library/src/module_common/java/com/nnbc123/library/common/glide/GlideUtils.kt b/library/src/module_common/java/com/nnbc123/library/common/glide/GlideUtils.kt index 1c1e193a5..860f37e3e 100644 --- a/library/src/module_common/java/com/nnbc123/library/common/glide/GlideUtils.kt +++ b/library/src/module_common/java/com/nnbc123/library/common/glide/GlideUtils.kt @@ -434,11 +434,9 @@ class GlideUtils { Logger.error(TAG, "loadUriGift imageView is null") return } - val options = RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE) getGlideConfig(imageView.context)?.apply { this.asBitmap() .load(uri) - .apply(options) .into(imageView) } }