同步3.x分支代码

Signed-off-by: tyBrave <tianyong21@h-partners.com>

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 3.2.0-rc.1
 - Added callback information for image loading
 - Added the interface for obtaining the upper limit and size of the current cache and the number of images corresponding to the current cache
+- Change the queue from Stack to Queue
+- ShowPixelMap callback PixelMap assigns value to Image component to synchronize
 
 ## 3.2.0-rc.0
 - Rollback the old version V1 decorator. V2 decorator will be provided in version 4.x

entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets

@@ -55,12 +55,12 @@ export default function DefaultJobQueueTest() {
 
       expect(job.getQueueLength()).assertEqual(7)
       expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("high1")
-      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium4")
-      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium3")
-      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium2")
       expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium1")
-      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("low2")
+      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium2")
+      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium3")
+      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("medium4")
       expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("low1")
+      expect(job.pop()!.imageKnifeOption.loadSrc).assertEqual("low2")
       expect(job.pop()).assertEqual(undefined)
       expect(job.getQueueLength()).assertEqual(0)
 

library/src/main/ets/ImageKnifeDispatcher.ets

@@ -84,7 +84,8 @@ export class ImageKnifeDispatcher {
           LogUtil.log("ImageKnife_DataTime_MemoryCache_onLoadStart:" + request.imageKnifeOption.loadSrc)
         }
         LogUtil.log("ImageKnife_DataTime_MemoryCache_showPixelMap.start:" + request.imageKnifeOption.loadSrc)
-        request.ImageKnifeRequestCallback?.showPixelMap(request.componentVersion, memoryCache.source, requestSource,memoryCache.imageAnimator)
+        request.ImageKnifeRequestCallback?.showPixelMap(request.componentVersion, memoryCache.source,
+          { width: memoryCache.imageWidth, height: memoryCache.imageHeight }, requestSource, memoryCache.imageAnimator)
         LogUtil.log("ImageKnife_DataTime_MemoryCache_showPixelMap.end:" + request.imageKnifeOption.loadSrc)
 
         if (requestSource == ImageKnifeRequestSource.SRC) {
@@ -425,7 +426,8 @@ export class ImageKnifeDispatcher {
               requestWithSource.request.requestState === ImageKnifeRequestState.PROGRESS)) {
             LogUtil.log("ImageKnife_DataTime_getAndShowImage_showPixelMap.start:"+currentRequest.imageKnifeOption.loadSrc)
             requestWithSource.request.ImageKnifeRequestCallback.showPixelMap(requestWithSource.request.componentVersion,
-              imageKnifeData.source, requestWithSource.source,imageKnifeData.imageAnimator);
+              imageKnifeData.source, { width: imageKnifeData.imageWidth, height: imageKnifeData.imageHeight },
+              requestWithSource.source, imageKnifeData.imageAnimator);
             LogUtil.log("ImageKnife_DataTime_getAndShowImage_showPixelMap.end:"+currentRequest.imageKnifeOption.loadSrc)
           }
 

library/src/main/ets/components/ImageKnifeAnimatorComponent.ets

@@ -111,7 +111,7 @@ export struct ImageKnifeAnimatorComponent {
         height,
         this.componentVersion,
         {
-          showPixelMap: async (version: number, pixelMap: PixelMap | string, requestSource: ImageKnifeRequestSource,imageAnimator?: Array<ImageFrameInfo>) => {
+          showPixelMap: (version: number, pixelMap: PixelMap | string,size: Size, requestSource: ImageKnifeRequestSource,imageAnimator?: Array<ImageFrameInfo>) => {
             if (version !== this.componentVersion) {
               return //针对reuse场景，不显示历史图片
             }

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

@@ -134,17 +134,16 @@ export struct ImageKnifeComponent {
         height,
         this.componentVersion,
         {
-          showPixelMap: async (version: number, pixelMap: PixelMap | string, requestSource: ImageKnifeRequestSource) => {
+          showPixelMap: (version: number, pixelMap: PixelMap | string,size:Size, requestSource: ImageKnifeRequestSource) => {
             if (version !== this.componentVersion) {
               return //针对reuse场景，不显示历史图片
             }
             this.pixelMap = pixelMap
             if (typeof this.pixelMap !== 'string') {
               if (this.imageKnifeOption.objectFit === ImageFit.Auto) {
-                let info = await this.pixelMap.getImageInfo()
 
                 this.adaptiveWidth = this.currentWidth
-                this.adaptiveHeight = info.size.height * this.currentWidth / info.size.width
+                this.adaptiveHeight = size.height * this.currentWidth / size.width
 
                 // if (this.currentWidth / this.currentHeight > info.size.width / info.size.height) {
                 //   this.adaptiveWidth = this.currentWidth

library/src/main/ets/model/ImageKnifeRequest.ets

@@ -73,5 +73,5 @@ export enum ImageKnifeRequestState {
 
 
 export interface ImageKnifeRequestCallback {
-  showPixelMap: (version: number, pixelMap: PixelMap | string , requestSource: ImageKnifeRequestSource,imageAnimator?: Array<ImageFrameInfo>) => void;
+  showPixelMap: (version: number, pixelMap: PixelMap | string ,size: Size, requestSource: ImageKnifeRequestSource,imageAnimator?: Array<ImageFrameInfo>) => void;
 }

library/src/main/ets/queue/DefaultJobQueue.ets

@@ -18,9 +18,9 @@ import Queue from '@ohos.util.Queue';
 import { taskpool,Stack } from '@kit.ArkTS';
 
 export class DefaultJobQueue implements IJobQueue {
-  highQueue: Stack<ImageKnifeRequest> = new Stack();
-  normalQueue: Stack<ImageKnifeRequest> = new Stack();
-  lowQueue: Stack<ImageKnifeRequest> = new Stack();
+  highQueue: Queue<ImageKnifeRequest> = new Queue();
+  normalQueue: Queue<ImageKnifeRequest> = new Queue();
+  lowQueue: Queue<ImageKnifeRequest> = new Queue();
 
   getQueueLength(): number {
     return this.highQueue.length + this.normalQueue.length + this.lowQueue.length
@@ -28,11 +28,11 @@ export class DefaultJobQueue implements IJobQueue {
 
   add(request: ImageKnifeRequest): void {
     if (request.imageKnifeOption.priority === undefined || request.imageKnifeOption.priority === taskpool.Priority.MEDIUM) {
-      this.normalQueue.push(request)
+      this.normalQueue.add(request)
     } else if (request.imageKnifeOption.priority === taskpool.Priority.HIGH) {
-      this.highQueue.push(request)
+      this.highQueue.add(request)
     } else {
-      this.lowQueue.push(request)
+      this.lowQueue.add(request)
     }
   }