floraachy
/
ImageKnife
mirror of https://gitee.com/openharmony-tpc/ImageKnife.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !112 from 张琥珀/master

This commit is contained in:
张琥珀 2024-02-02 09:07:59 +00:00 committed by Gitee
parent a486b36cee 5ce6fe50cd
commit 16ff4222e7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 214 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
entry/src/main/ets/entryability/EntryAbility.ets
View File

@ -49,6 +49,9 @@ export default class EntryAbility extends UIAbility {
imageKnife.setEngineKeyImpl(new CustomEngineKeyImpl())
// 设置全局内存缓存大小张数
imageKnife.setLruCacheSize(100, 100 * 1204 * 1024)
// 请求头调用
imageKnife.addHeader('aaa', "全局调用iamgeKnife");
imageKnife.deleteHeader('aaa');
}
// 开启ImageKnife所有级别日志开关
LogUtil.mLogLevel = LogUtil.ALL

3
entry/src/main/ets/pages/RequestOptionLoadImage.ets
View File

@ -34,6 +34,9 @@ struct RequestOptionLoadImage {
load(src: string | image.PixelMap | Resource) {
clearTimeout(timeId)
let request = new RequestOption()
//*requestOption调用*
request.addHeader('aaa', "RequestOption拿到了");
request.load(src)
.addListener({ callback: (err: BusinessError | string, data: ImageKnifeData) => {
if (data.isPixelMap()) {

8
entry/src/main/ets/pages/imageknifeTestCaseIndex.ets
View File

@ -306,6 +306,14 @@ struct IndexFunctionDemo {
router.pushUrl({ url: 'pages/testImageKnifeRouter1' });
}).margin({ top: 5, left: 3 })
}.width('100%').height(60).backgroundColor(Color.Pink)
Text('测试图片header属性').fontSize(15)
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
Button('图片header属性设置')
.onClick(() => {
router.pushUrl({ url: 'pages/testImageKnifeHttpRequestHeader' });
}).margin({ top: 5, left: 3 })
}.width('100%').height(60).backgroundColor(Color.Pink)
}
}
.width('100%')

20
entry/src/main/ets/pages/index.ets
View File

@ -17,7 +17,8 @@ import {
ImageKnifeComponent,
ImageKnifeOption,
ImageKnifeGlobal,
ImageKnife
ImageKnife,
HeaderOptions
} from '@ohos/libraryimageknife'
import { ObjectKey } from '@ohos/libraryimageknife';
@ -25,21 +26,30 @@ import { ObjectKey } from '@ohos/libraryimageknife';
@Entry
@Component
struct IndexFunctionDemo {
@State headerOptions: HeaderOptions = {
key: 'aaa',
value: '单个image组件调用'
};
@State headerOptions1: HeaderOptions = {
key: 'bbb',
value: '单个image组件调用1'
};
@State imageKnifeOption1: ImageKnifeOption =
{
loadSrc: $r('app.media.icon'),
placeholderSrc: $r('app.media.icon_loading'),
errorholderSrc: $r('app.media.icon_failed')
errorholderSrc: $r('app.media.icon_failed'),
headerOption: [this.headerOptions, this.headerOptions1]
};
@State imageKnifeOption2: ImageKnifeOption =
{
loadSrc: $r('app.media.icon'),
placeholderSrc: $r('app.media.icon_loading'),
errorholderSrc: $r('app.media.icon_failed')
errorholderSrc: $r('app.media.icon_failed'),
headerOption: [this.headerOptions, this.headerOptions1]
};
build() {

133
entry/src/main/ets/pages/testImageKnifeHttpRequestHeader.ets Normal file
View File

@ -0,0 +1,133 @@
/*
* Copyright (C) 2023 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {
HeaderOptions,ImageKnife,ImageKnifeComponent,ImageKnifeData,ImageKnifeGlobal,RequestOption,ImageKnifeOption
} from '@ohos/libraryimageknife'
import { image } from '@ohos.multimedia.image'
import { BusinessError } from '@ohos.base'
const TAG = "TEST-"
let timeId = -1
@Entry
@Component
struct testImageKnifeHttpRequestHeader {
@State pixelMap: PixelMap | undefined = undefined;
@State message: string = "图片header属性测试";
//单个组件多个请求头调用，对应下面以组件形式调用
@State headerOptions: HeaderOptions = {
key: "aaa",
value: "单张imageKnife组件调用"
};
@State headerOptions1: HeaderOptions = {
key: "bbb",
value: "单张imageKnife组件调用1"
};
@State imageKnifeOption1: ImageKnifeOption =
{
loadSrc: '图片网络地址',
placeholderSrc: $r('app.media.icon_loading'),
errorholderSrc: $r('app.media.icon_failed'),
headerOption: [this.headerOptions, this.headerOptions1]
};
// RequestOption调用
load(src: string | image.PixelMap | Resource) {
clearTimeout(timeId)
let request = new RequestOption()
request.load(src)
.addListener({ callback: (err: BusinessError | string, data: ImageKnifeData) => {
if (data.isPixelMap()) {
if (data.drawPixelMap) {
let pixelmap = data.drawPixelMap.imagePixelMap
if (pixelmap) {
this.pixelMap = pixelmap
}
}
}
if (data.isGIFFrame()) {
let index: number = 0
if (data.drawGIFFrame) {
if (data.drawGIFFrame.imageGIFFrames) {
let renderGif = () => {
if (data.drawGIFFrame) {
if (data.drawGIFFrame.imageGIFFrames) {
let pixelmap = data.drawGIFFrame.imageGIFFrames[index].drawPixelMap
let delay = data.drawGIFFrame.imageGIFFrames[index].delay
if (pixelmap) {
this.pixelMap = pixelmap
}
index++;
if (index == data.drawGIFFrame.imageGIFFrames.length - 1) {
index = 0
}
timeId = setTimeout(renderGif, data!.drawGIFFrame!.imageGIFFrames![index].delay)
}
}
}
renderGif()
}
}
}
if (err) {
console.log(TAG + "error:" + JSON.stringify(err));
}
return false
}
})
let imageknife: ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife()
if (imageknife != undefined) {
imageknife.call(request)
}
}
build() {
Column() {
Text(`${this.message}`)
.width("300vp")
.height("60vp")
.textAlign(TextAlign.Center)
.fontSize("30fp")
.fontWeight(FontWeight.Bold)
Flex({ direction: FlexDirection.Row }) {
Button("requestoption调用")
.margin(16)
.onClick(() => {
this.load("请求的网络图片")
})
Button("全局调用imageKnife")
.margin(16)
.onClick(() => {
this.load("请求的网络图片")
})
}
// RequestOptiom形式image显示
ImageKnifeComponent({
imageKnifeOption: {
loadSrc: this.pixelMap as image.PixelMap
}
}).width(200).height(200).borderWidth(1)
// 单个组件形式image显示
ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 })
.margin(16)
.width(200)
.height(200)
}
.width("100%")
.height("100%")
.justifyContent(FlexAlign.Center)
}
}

3
entry/src/main/resources/base/profile/main_pages.json
View File

@ -38,6 +38,7 @@
"pages/testImageAntiAliasingWithPage",
"pages/testImageKnifeRouter1",
"pages/testImageKnifeRouter2",
"pages/RequestOptionLoadImage"
"pages/RequestOptionLoadImage",
"pages/testImageKnifeHttpRequestHeader"
]
}

2
library/index.ets
View File

@ -99,7 +99,7 @@ export { ObjectKey } from './src/main/ets/components/imageknife/ObjectKey'
export {RequestOption,Size,DetachFromLayout} from './src/main/ets/components/imageknife/RequestOption'
export { ImageKnifeComponent, ScaleType, ScaleTypeHelper, AntiAliasing} from './src/main/ets/components/imageknife/ImageKnifeComponent'
export { ImageKnifeDrawFactory } from './src/main/ets/components/imageknife/ImageKnifeDrawFactory'
export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions} from './src/main/ets/components/imageknife/ImageKnifeOption'
export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions,HeaderOptions} from './src/main/ets/components/imageknife/ImageKnifeOption'
export { ImageKnifeData } from './src/main/ets/components/imageknife/ImageKnifeData'
export {IAllCacheInfoCallback,AllCacheInfo,ResourceCacheInfo,MemoryCacheInfo,DataCacheInfo} from './src/main/ets/components/imageknife/interface/IAllCacheInfoCallback'
export {IParseImage} from './src/main/ets/components/imageknife/interface/IParseImage'

14
library/src/main/ets/components/imageknife/ImageKnife.ets
View File

@ -50,7 +50,7 @@ export class ImageKnife {
resourceFetch: IResourceFetch<ArrayBuffer>;
filesPath: string = ""; // data/data/包名/files目录
headerMap: Map<string, string> = new Map<string, string>(); //定义全局map
placeholderCache: string = "placeholderCache"
runningMaps: EasyLinkedHashMap<string, RequestOption>;
pendingMaps: EasyLinkedHashMap<string, RequestOption>;
@ -99,6 +99,14 @@ export class ImageKnife {
}
//全局设置请求头调用方法
addHeader(key: string, value: string) {
this.headerMap.set(key, value);
}
deleteHeader(key: string) {
this.headerMap.delete(key);
}
getMemoryCache(): MemoryLruCache {
return this.memoryCache;
@ -279,6 +287,10 @@ export class ImageKnife {
// 每个request 公共信息补充
request.setFilesPath(this.filesPath);
if (this.headerMap.size > 0) {
request.addHeaderMap(this.headerMap)
}
// 首先执行占位图 解析任务
if (request.placeholderSrc) {
PlaceHolderManager.execute(request)

8
library/src/main/ets/components/imageknife/ImageKnifeComponent.ets
View File

@ -222,6 +222,14 @@ export struct ImageKnifeComponent {
}
configDisplay(request: RequestOption) {
//单个image组件多个请求头调用
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.value);
}
console.log('wxxx 999:' + JSON.stringify(this.imageKnifeOption.headerOption.length));
}
if (this.imageKnifeOption.placeholderSrc) {
request.placeholder(this.imageKnifeOption.placeholderSrc, {asyncSuccess:(data:ImageKnifeData) => {
LogUtil.log('ImageKnifeComponent request.placeholder callback')

8
library/src/main/ets/components/imageknife/ImageKnifeOption.ets
View File

@ -57,9 +57,15 @@ export interface TransformOptions{
rotateImage?: number
}
export interface HeaderOptions {
key: string;
value: string;
}
@Observed
export class ImageKnifeOption {
// header请求列表
headerOption?: Array<HeaderOptions>;
// 主图资源
loadSrc: string | PixelMap | Resource = '';
mainScaleType?: ScaleType = ScaleType.FIT_CENTER

11
library/src/main/ets/components/imageknife/RequestOption.ets
View File

@ -60,6 +60,17 @@ export interface DetachFromLayout{
}
export class RequestOption {
// 遍历添加图片http请求头
map: Map<string, string> = new Map<string, string>();
// RequestOption调用header对于的方法
addHeader(key: string, value: string) {
this.map.set(key, value);
}
// 全局调用header对应的方法，包含RequestOption的形式
addHeaderMap(map: Map<string, string>) {
this.map = map;
}
uuid:string ='' // 唯一标识
loadSrc: string | PixelMap | Resource = '';
strategy: DiskStrategy = new AUTOMATIC();

11
library/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets
View File

@ -29,6 +29,13 @@ class RequestData{
totalSize: number = 2000
}
class Header {
public map: Map<string, string> = new Map<string, string>();
constructor(map: Map<string, string>) {
this.map = map;
}
}
export class HttpDownloadClient implements IDataFetch {
loadData(request: RequestOption, onComplete: (img: ArrayBuffer) => void, onError: (err: string) => void) {
try {
@ -45,7 +52,6 @@ export class HttpDownloadClient implements IDataFetch {
// 下载数据流多次返回
arrayBuffers.push(data);
})
httpRequest.on('dataReceiveProgress', (data: RequestData) => {
// 下载进度
if(data != undefined && (typeof data.receiveSize == 'number') && (typeof data.totalSize == 'number') ) {
@ -55,16 +61,17 @@ export class HttpDownloadClient implements IDataFetch {
}
}
})
httpRequest.on('dataEnd', () => {
// 下载完毕
let combineArray = this.combineArrayBuffers(arrayBuffers);
onComplete(combineArray)
})
console.log('refer' + JSON.stringify(request.map.get('aaa')));
httpRequest.requestInStream(
request.loadSrc as string,
{
header: new Header(request.map),
method: http.RequestMethod.GET,
expectDataType: http.HttpDataType.ARRAY_BUFFER,
connectTimeout: 60000, // 可选 默认60000ms

2
sharedlibrary/src/main/ets/Index.ets
View File

@ -101,7 +101,7 @@ export {RequestOption,Size} from '@ohos/imageknife'
export {ObjectKey} from '@ohos/imageknife'
export { ImageKnifeComponent, ScaleType, ScaleTypeHelper, AntiAliasing} from '@ohos/imageknife'
export { ImageKnifeDrawFactory } from '@ohos/imageknife'
export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions} from '@ohos/imageknife'
export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions,HeaderOptions} from '@ohos/imageknife'
export { ImageKnifeData } from '@ohos/imageknife'
export {IAllCacheInfoCallback,AllCacheInfo,ResourceCacheInfo,MemoryCacheInfo,DataCacheInfo} from '@ohos/imageknife'
export {IParseImage} from '@ohos/imageknife'