Просмотр исходного кода

Revert 修改OCR拍摄识别文件大小限制

zhouguangyuan 2 недель назад
Родитель
Сommit
2254337e49
3 измененных файлов с 13 добавлено и 13 удалено
  1. 6 6
      src/utils/imageCompression.ts
  2. 1 1
      src/utils/imageFormat.ts
  3. 6 6
      src/views/inbound/photoOCR/index.vue

+ 6 - 6
src/utils/imageCompression.ts

@@ -15,7 +15,7 @@ async function compressImageToTargetSize(
   file: File,
   targetMinSize: number,
   targetMaxSize: number,
-  quality: number = 1
+  quality: number = 0.9
 ): Promise<File> {
   return new Promise((resolve, reject) => {
     const canvas = document.createElement('canvas')
@@ -236,8 +236,8 @@ function compressWithHigherQuality(
  */
 export async function compressImage(
   file: File,
-  maxSize: number = 5 * 1024 * 1024,
-  quality: number = 1
+  maxSize: number = 1 * 1024 * 1024,
+  quality: number = 0.9
 ): Promise<File> {
   // 如果文件小于等于最大限制,直接返回原文件
   if (file.size <= maxSize) {
@@ -245,8 +245,8 @@ export async function compressImage(
   }
 
   // 对于大于1MB的文件,设置目标大小为0.8MB-1MB之间
-  const targetMinSize = 1024 * 1024// 1MB
-  const targetMaxSize = maxSize // 5MB
+  const targetMinSize = 800 * 1024 // 800KB
+  const targetMaxSize = maxSize // 1MB
   return compressImageToTargetSize(file, targetMinSize, targetMaxSize, quality)
 }
 
@@ -259,7 +259,7 @@ export async function compressImage(
  */
 export async function compressImages(
   files: File[],
-  maxSize: number = 5 * 1024 * 1024,
+  maxSize: number = 1 * 1024 * 1024,
   quality: number = 0.8
 ): Promise<File[]> {
   const results: File[] = []

+ 1 - 1
src/utils/imageFormat.ts

@@ -35,7 +35,7 @@ export async function convertHeicHeifToWebp(file: File): Promise<File> {
     const result = await heic2any({
       blob: file,
       toType: 'image/webp',
-      quality: 1,
+      quality: 0.92,
     })
 
     const blob = Array.isArray(result) ? result[0] : result

+ 6 - 6
src/views/inbound/photoOCR/index.vue

@@ -118,9 +118,9 @@ const autoUploadImage = async (file, barcode = null) => {
     return
   }
 
-  // 检查图片大小是否超过4MB
-  if (file.size > 4 * 1024 * 1024) {
-    showFailToast('图片大小不能超过4MB')
+  // 检查图片大小是否超过2MB
+  if (file.size > 2 * 1024 * 1024) {
+    showFailToast('图片大小不能超过2MB')
     return
   }
 
@@ -367,10 +367,10 @@ const submitOCR = async () => {
     return
   }
 
-  // 检查图片大小是否超过4MB
+  // 检查图片大小是否超过2MB
   const image = uploadImages.value[0]
-  if (image.file.size > 4 * 1024 * 1024) {
-    showFailToast('图片大小不能超过4MB')
+  if (image.file.size > 2 * 1024 * 1024) {
+    showFailToast('图片大小不能超过2MB')
     return
   }