Pre Merge pull request !447 from zgf/master

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Modify memory cache limit and file cache limit
 - Fix record decodeEndTime in imageKinfaData
 - Add image buffersize in memory cache
+- Optimize the magic number of heif format image files
+- Default image request does not require duplicate creation
 
 ## 3.2.0-rc.6
 - Support LogUtil to turn off log

library/src/main/ets/components/ImageKnifeComponent.ets

@@ -140,6 +140,11 @@ export struct ImageKnifeComponent {
   }
 
   getRequest(width: number, height: number,componentId: number): ImageKnifeRequest {
+    if (this.imageKnifeOption.downsampleOf !== undefined) {
+      this.request = undefined
+    }
+    
+    if (this.request == undefined) {
       this.request = new ImageKnifeRequest(
         this.imageKnifeOption,
         this.imageKnifeOption.context !== undefined ? this.imageKnifeOption.context : this.getCurrentContext(),
@@ -174,6 +179,7 @@ export struct ImageKnifeComponent {
         },
         componentId
       )
+    }
     return this.request
   }
 }

library/src/main/ets/utils/FileTypeUtil.ets

@@ -26,7 +26,7 @@ export class FileTypeUtil {
     'ico': [new Uint8Array([0x00,0x00,0x01,0x00])],
     'tiff': [new Uint8Array([0x49, 0x20, 0x49]), new Uint8Array([0x49, 0x49, 0x2A, 0x00]), new Uint8Array([0x4D, 0x4D, 0x00, 0x2A]), new Uint8Array([0x4D, 0x4D, 0x00, 0x2B])],
     // 添加更多的文件类型和特征
-    'heic': [new Uint8Array([0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63, 0x00, 0x00, 0x00, 0x00]),new Uint8Array([0x00, 0x00, 0x00, 0x1C, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63, 0x00, 0x00, 0x00, 0x00])],
+    'heic': [new Uint8Array([0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x68, 0x65, 0x69, 0x63]),new Uint8Array([0x00, 0x00, 0x00, 0x1C, 0x66, 0x74, 0x79, 0x70, 0x6D, 0x69, 0x66, 0x31])],
   };