From a7909f84fefaee8317475ca5ff220510257b29ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=90=A5=E7=8F=80?= Date: Fri, 2 Feb 2024 15:59:09 +0800 Subject: [PATCH] =?UTF-8?q?imageKnife=20header=E8=AF=B7=E6=B1=82=E5=A4=B4?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=E5=90=88?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/index.ets | 8 +++---- .../pages/testImageKnifeHttpRequestHeader.ets | 23 +++++++++---------- .../ets/components/imageknife/ImageKnife.ets | 2 +- .../imageknife/ImageKnifeComponent.ets | 4 ++-- .../imageknife/ImageKnifeOption.ets | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/entry/src/main/ets/pages/index.ets b/entry/src/main/ets/pages/index.ets index bf47aa0..8c3dd71 100644 --- a/entry/src/main/ets/pages/index.ets +++ b/entry/src/main/ets/pages/index.ets @@ -13,12 +13,12 @@ * limitations under the License. */ import router from '@ohos.router'; -import { HeaderOption } from '@ohos/imageKnife/src/main/ets/components/imageKnife/ImageKnifeOption'; import { ImageKnifeComponent, ImageKnifeOption, ImageKnifeGlobal, - ImageKnife + ImageKnife, + HeaderOptions } from '@ohos/libraryimageknife' import { ObjectKey } from '@ohos/libraryimageknife'; @@ -28,12 +28,12 @@ import { ObjectKey } from '@ohos/libraryimageknife'; struct IndexFunctionDemo { @State headerOptions: HeaderOptions = { key: 'aaa', - values: '单个image组件调用' + value: '单个image组件调用' }; @State headerOptions1: HeaderOptions = { key: 'bbb', - values: '单个image组件调用1' + value: '单个image组件调用1' }; @State imageKnifeOption1: ImageKnifeOption = diff --git a/entry/src/main/ets/pages/testImageKnifeHttpRequestHeader.ets b/entry/src/main/ets/pages/testImageKnifeHttpRequestHeader.ets index b0e66d0..5755fa0 100644 --- a/entry/src/main/ets/pages/testImageKnifeHttpRequestHeader.ets +++ b/entry/src/main/ets/pages/testImageKnifeHttpRequestHeader.ets @@ -14,11 +14,10 @@ */ import { - HeaderOptions,ImageKnife,ImageKnifeComponent,ImageKnifeData,ImageKnifeGlobal,RequestOption + HeaderOptions,ImageKnife,ImageKnifeComponent,ImageKnifeData,ImageKnifeGlobal,RequestOption,ImageKnifeOption } from '@ohos/libraryimageknife' -import { ImageKnifeOption } from '@ohos/libraryimageknife' -import { image } from '@kit.ImageKit' -import { BusinessError } from '@kit.BasicServiceKit' +import { image } from '@ohos.multimedia.image' +import { BusinessError } from '@ohos.base' const TAG = "TEST-" let timeId = -1 @@ -26,23 +25,23 @@ let timeId = -1 @Entry @Component struct testImageKnifeHttpRequestHeader { - @State pixelMap: PixelMap | underfined = underfined; + @State pixelMap: PixelMap | undefined = undefined; @State message: string = "图片header属性测试"; //单个组件多个请求头调用，对应下面以组件形式调用 - @State headerOptions: headerOptions = { + @State headerOptions: HeaderOptions = { key: "aaa", values: "单张imageKnife组件调用" }; - @State headerOptions1: headerOptions = { + @State headerOptions1: HeaderOptions = { key: "bbb", values: "单张imageKnife组件调用1" }; - @State imageKnifeOption1: imageKnifeOption = + @State imageKnifeOption1: ImageKnifeOption = { loadSrc: '图片网络地址', placeholderSrc: $r('app.media.icon_loading'), errorholderSrc: $r('app.media.icon_failed'), - headerOption: [this.headerOptions, this.headerOption1] + headerOption: [this.headerOptions, this.headerOptions1] }; // RequestOption调用 @@ -117,8 +116,8 @@ struct testImageKnifeHttpRequestHeader { } // RequestOptiom形式image显示 ImageKnifeComponent({ - inageKnifeOption: { - LoadSrc: this.pixelMap as inage.PixelMap + imageKnifeOption: { + loadSrc: this.pixelMap as image.PixelMap } }).width(200).height(200).borderWidth(1) // 单个组件形式image显示 @@ -129,6 +128,6 @@ struct testImageKnifeHttpRequestHeader { } .width("100%") .height("100%") - .justifyContent(FLexAlign.Center) + .justifyContent(FlexAlign.Center) } } diff --git a/library/src/main/ets/components/imageknife/ImageKnife.ets b/library/src/main/ets/components/imageknife/ImageKnife.ets index 22ad35d..4118165 100644 --- a/library/src/main/ets/components/imageknife/ImageKnife.ets +++ b/library/src/main/ets/components/imageknife/ImageKnife.ets @@ -50,7 +50,7 @@ export class ImageKnife { resourceFetch: IResourceFetch; filesPath: string = ""; // data/data/包名/files目录 - headerMap: Map = new Map(); //定义全局map + headerMap: Map = new Map(); //定义全局map placeholderCache: string = "placeholderCache" runningMaps: EasyLinkedHashMap; pendingMaps: EasyLinkedHashMap; diff --git a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets index ab0ac57..3f22887 100644 --- a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets +++ b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets @@ -223,10 +223,10 @@ export struct ImageKnifeComponent { configDisplay(request: RequestOption) { //单个image组件多个请求头调用 - if (this.imageKnifeOption.headerOption != underfined && this.imageKnifeOption.headerOption?.length > 0) { + if (this.imageKnifeOption.headerOption != undefined && this.imageKnifeOption.headerOption?.length > 0) { for (let i = 0; i < this.imageKnifeOption.headerOption.length; i++) { let headerOptions = this.imageKnifeOption.headerOption[i]; - request.addHeader(headerOptions.key, headerOptions.values); + request.addHeader(headerOptions.key, headerOptions.value); } console.log('wxxx 999:' + JSON.stringify(this.imageKnifeOption.headerOption.length)); } diff --git a/library/src/main/ets/components/imageknife/ImageKnifeOption.ets b/library/src/main/ets/components/imageknife/ImageKnifeOption.ets index 9069b3b..737ebe4 100644 --- a/library/src/main/ets/components/imageknife/ImageKnifeOption.ets +++ b/library/src/main/ets/components/imageknife/ImageKnifeOption.ets @@ -59,7 +59,7 @@ export interface TransformOptions{ export interface HeaderOptions { key: string; - values: string; + value: string; } @Observed