Pre Merge pull request !440 from zgf/master

Signed-off-by: zgf <zenggaofeng2@h-partners.com>

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

@@ -110,8 +110,7 @@ export struct ImageKnifeComponent {
             if (this.imageKnifeOption.objectFit === ImageFit.Auto && this.isImageFitAutoResize) {
               this.isImageFitAutoResize = false
             } else {
-              ImageKnife.getInstance().execute(this.getRequest(
+              ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight,this.getUniqueId()))
-                this.currentWidth, this.currentHeight, this.getUniqueId()))
             }
           }
         }
@@ -128,8 +127,7 @@ export struct ImageKnifeComponent {
       ' placeholderSrc = ' + this.imageKnifeOption.placeholderSrc +
       ' errorholderSrc = ' + this.imageKnifeOption.errorholderSrc +
       ' componentId = ' + this.getUniqueId())
-    ImageKnife.getInstance().execute(this.getRequest(
+    ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight,this.getUniqueId()))
-      this.currentWidth, this.currentHeight, this.getUniqueId()))
   }
 
   getCurrentContext(): common.UIAbilityContext {
@@ -159,8 +157,8 @@ export struct ImageKnifeComponent {
           fileCache = fileCache - net
           let source = memory == 1 ? 'memory' : fileCache == 1 ? 'fileCache' : 'downLoad'
           LogUtil.info('image load showPixelMap:' + this.request?.componentId + ',srcType:' + requestSource +
-            ',version:' + this.request?.componentVersion +
+            ',version:' + this.request?.componentVersion
-            ',size:' + JSON.stringify(size) + ',source:' + source)
+            + ',size:' + JSON.stringify(size) + ',source:' + source)
           if (typeof this.pixelMap !== 'string') {
             if (this.imageKnifeOption.objectFit === ImageFit.Auto && this.isImageFitAutoResize == false) {
               this.adaptiveHeight = this.currentWidth * size.height / size.width