Prechádzať zdrojové kódy

feat: 修改OssData文件类型定义

DoggyZhang 2 mesiacov pred
rodič
commit
8bc493bfb9

+ 1 - 1
frame/bom/build.gradle

@@ -6,7 +6,7 @@ plugins {
 ext {
     GROUP_ID = 'com.wenext.android'
     ARTIFACT_ID = 'frame-bom'
-    VERSION = '6.2.0'
+    VERSION = '6.2.1'
 }
 
 dependencies {

+ 1 - 1
frame/oss/build.gradle

@@ -7,7 +7,7 @@ plugins {
 ext {
     GROUP_ID = 'com.wenext.android'
     ARTIFACT_ID = 'frame-oss'
-    VERSION = '6.0.3'
+    VERSION = '6.0.4'
 }
 
 if (project.FRAME_DEBUG != "true") {

+ 12 - 17
frame/oss/src/main/java/com/adealink/frame/oss/data/OssData.kt

@@ -35,26 +35,19 @@ sealed class UploadFile(
         private const val WAV_SUFFIX = "wav"
 
         private val videoExtensions = setOf("mp4", "avi", "3gpp", "3gp", "mov", "mkv", "flv")
-        private val imageExtensions = setOf("png", "jpeg", "gif", "jpg", "webp", "bmp", "heic", "heif")
+        private val imageExtensions =
+            setOf("png", "jpeg", "gif", "jpg", "webp", "bmp", "heic", "heif")
         private val audioExtensions = setOf("mp3", "wav", "flac", "ogg", "aac", "m4a", "wma")
     }
 
     enum class FileType(val dir: String, val suffix: String) {
         IMAGE("image", PNG_SUFFIX),
-        ROOM_CHAT_IMAGE("room_chat_image", PNG_SUFFIX),
-        LOG("log", "zip"),
         VIDEO("video", MP4_SUFFIX),
-        LONG_STRING("long_string", TXT_SUFFIX),
-        ROOM_CHAT_IMAGE_GIF("room_chat_image_gif", GIF_SUFFIX),
-        GIF("gif", GIF_SUFFIX),
-        ANCHOR_RECORD("lama_mic_grab/anchor_record", M4A_SUFFIX),
-        MP3("mp3", MP3_SUFFIX),
-        M4A("mp3", M4A_SUFFIX),
-        AAC("mp3", AAC_SUFFIX),
-        WAV("mp3", WAV_SUFFIX),
-        TYPE_OF_IMAGE("image", ""),//所有类型的图片
-        TYPE_OF_VIDEO("video", ""),//所有类型的视频
-        TYPE_OF_AUDIO("audio", "");//所有类型的音频
+        AUDIO("video", MP3_SUFFIX),
+        AVATAR("avatar", PNG_SUFFIX),//头像
+        ATTACHMENT("attachment",""), //附件,文本,图片,视频等
+        LOG("log", "zip"),
+        OTHER("other", "zip"); //不知道什么分类
 
         fun isImage(): Boolean = this.suffix.lowercase() in imageExtensions
 
@@ -62,9 +55,9 @@ sealed class UploadFile(
 
         fun isAudio(): Boolean = this.suffix.lowercase() in audioExtensions
 
-        fun isImageCompressible() : Boolean = this.isImage() && this.suffix.lowercase() != GIF_SUFFIX
+        fun isImageCompressible(): Boolean = this.isImage() && this.suffix.lowercase() != GIF_SUFFIX
 
-        fun isVideoCompressible() : Boolean = this.suffix.lowercase() == MP4_SUFFIX
+        fun isVideoCompressible(): Boolean = this.suffix.lowercase() == MP4_SUFFIX
 
         fun isMp3(): Boolean = this.suffix.lowercase() == MP3_SUFFIX
     }
@@ -135,7 +128,9 @@ sealed class UploadFile(
     }
 
     private fun isMediaFileType(): Boolean {
-        return fileType == FileType.IMAGE || fileType == FileType.VIDEO || fileType == FileType.GIF || fileType == FileType.ROOM_CHAT_IMAGE || fileType == FileType.ROOM_CHAT_IMAGE_GIF
+        return fileType == FileType.IMAGE
+                || fileType == FileType.VIDEO
+                || fileType == FileType.AUDIO
     }
 }