From ea566c3eeb92643186cbd9a477e9e476915668ca Mon Sep 17 00:00:00 2001 From: zhoulisheng <635547767@qq.com> Date: Wed, 6 Dec 2023 14:57:26 +0800 Subject: [PATCH] =?UTF-8?q?1.svg=E7=9A=84=E5=9C=B0=E5=9D=80=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhoulisheng <635547767@qq.com> --- NOTICE | 2 +- .../pages/testImageKnifeOptionChangedPage.ets | 23 +++++++++++++++++-- entry/src/main/ets/pages/testPreloadPage.ets | 23 +++++++++++++++---- .../imageknife/ImageKnifeComponent.ets | 6 ++--- .../networkmanage/LoadDataShareFileClient.ets | 6 ++--- .../components/imageknife/utils/FastBlur.ets | 2 +- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/NOTICE b/NOTICE index 76349e6..cdbbfe8 100644 --- a/NOTICE +++ b/NOTICE @@ -148,7 +148,7 @@ http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html Java Author: Mario Klingemann http://incubator.quasimondo.com -created Feburary 29, 2004 +created February 29, 2004 port : Yahel Bouaziz http://www.kayenko.com ported april 5th, 2012 diff --git a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets index e2aaf7c..dc95841 100644 --- a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets +++ b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets @@ -23,6 +23,7 @@ import worker from '@ohos.worker' @Component struct TestImageKnifeOptionChangedPage { + svgUrl:string = '' @State imageKnifeOption1: ImageKnifeOption = { loadSrc: $r('app.media.jpgSample'), @@ -139,10 +140,28 @@ struct TestImageKnifeOptionChangedPage { errorholderSrc: $r('app.media.icon_failed') }; }).margin({left:5}).backgroundColor(Color.Blue) - Button('svg') + + Text("请先设置SVG图片的url地址") + TextArea({ placeholder: '请输入SVG图片的url地址' }) + .placeholderColor("rgb(0,0,35)") + .placeholderFont({ size: 20, weight: 100, family: 'cursive', style: FontStyle.Italic }) + .textAlign(TextAlign.Center) + .caretColor(Color.Blue) + .height(40) + .width(400) + .fontSize(20) + .fontWeight(FontWeight.Bold) + .fontFamily("sans-serif") + .fontStyle(FontStyle.Normal) + .fontColor(Color.Red) + .onChange((value: string) => { + this.svgUrl = value + }) + + Button('svg') .onClick(()=>{ this.imageKnifeOption1 = { - loadSrc: 'http://124.222.187.78/download/test.svg', + loadSrc: this.svgUrl, placeholderSrc: $r('app.media.icon_loading'), errorholderSrc: $r('app.media.icon_failed') diff --git a/entry/src/main/ets/pages/testPreloadPage.ets b/entry/src/main/ets/pages/testPreloadPage.ets index 7d0272a..62a16be 100644 --- a/entry/src/main/ets/pages/testPreloadPage.ets +++ b/entry/src/main/ets/pages/testPreloadPage.ets @@ -23,7 +23,7 @@ import { BusinessError } from '@ohos.base' @Entry @Component struct TestPreloadPage { - + svgUrl:string = '' @State imageKnifeOption1: ImageKnifeOption = { loadSrc: $r('app.media.jpgSample'), @@ -255,13 +255,28 @@ struct TestPreloadPage { } .margin({ top: 15 }) - + Text("请先设置SVG图片的url地址") + TextArea({ placeholder: '请输入SVG图片的url地址' }) + .placeholderColor("rgb(0,0,35)") + .placeholderFont({ size: 20, weight: 100, family: 'cursive', style: FontStyle.Italic }) + .textAlign(TextAlign.Center) + .caretColor(Color.Blue) + .height(40) + .width(400) + .fontSize(20) + .fontWeight(FontWeight.Bold) + .fontFamily("sans-serif") + .fontStyle(FontStyle.Normal) + .fontColor(Color.Red) + .onChange((value: string) => { + this.svgUrl = value + }) Flex({ direction: FlexDirection.Row }) { Button('预加载网络资源svg') .onClick(() => { let request = new RequestOption(); - request.load('http://124.222.187.78/download/test.svg') + request.load(this.svgUrl) .setImageViewSize({ width: 300, height: 300 }) .addListener({callback:(err:BusinessError|string, data:ImageKnifeData) => { if (err) { @@ -279,7 +294,7 @@ struct TestPreloadPage { Button('网络资源svg') .onClick(() => { this.imageKnifeOption = { - loadSrc: 'http://124.222.187.78/download/test.svg', + loadSrc: this.svgUrl, placeholderSrc: $r('app.media.icon_loading'), errorholderSrc: $r('app.media.icon_failed'), diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets index e997ec7..f18d5d8 100644 --- a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets +++ b/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets @@ -443,7 +443,7 @@ export struct ImageKnifeComponent { LogUtil.log('ImageKnifeComponent default drawPlaceholder start!') data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { - LogUtil.log('ImageKnifeComponent imageinfo widht =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) let scaleType = (typeof imageKnifeOption.placeholderScaleType == 'number') ? imageKnifeOption.placeholderScaleType : ScaleType.FIT_CENTER context.save(); context.clearRect(0, 0, compWidth, compHeight) @@ -498,7 +498,7 @@ export struct ImageKnifeComponent { LogUtil.log('ImageKnifeComponent default drawThumbSizeMultiplier start!') data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { - LogUtil.log('ImageKnifeComponent imageinfo widht =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) let scaleType = (typeof imageKnifeOption.thumbSizeMultiplierScaleType == 'number') ? imageKnifeOption.thumbSizeMultiplierScaleType : ScaleType.FIT_CENTER context.save(); context.clearRect(0, 0, compWidth, compHeight) @@ -548,7 +548,7 @@ export struct ImageKnifeComponent { LogUtil.log('ImageKnifeComponent default drawErrorholder start!') data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { - LogUtil.log('ImageKnifeComponent imageinfo widht =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) let scaleType = (typeof imageKnifeOption.errorholderSrcScaleType == 'number') ? imageKnifeOption.errorholderSrcScaleType : ScaleType.FIT_CENTER context.save(); context.clearRect(0, 0, compWidth, compHeight) diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets index 6ba18ab..e080a67 100644 --- a/imageknife/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets +++ b/imageknife/src/main/ets/components/imageknife/networkmanage/LoadDataShareFileClient.ets @@ -27,13 +27,13 @@ export class LoadDataShareFileClient implements IDataFetch { onComplete(buf); fs.close(file.fd); }).catch((err:BusinessError) => { - onError('LoadDataShareFileClient fs.read err happend uri=' + request.loadSrc + " err.msg=" + err?.message + " err.code=" + err?.code) + onError('LoadDataShareFileClient fs.read err happened uri=' + request.loadSrc + " err.msg=" + err?.message + " err.code=" + err?.code) }) }).catch((err:BusinessError) => { - onError('LoadDataShareFileClient fs.stat err happend uri=' + request.loadSrc + " err.msg=" + err?.message + " err.code=" + err?.code) + onError('LoadDataShareFileClient fs.stat err happened uri=' + request.loadSrc + " err.msg=" + err?.message + " err.code=" + err?.code) }) }).catch((err:BusinessError) => { - onError('LoadDataShareFileClient fs.open err happend uri=' + request.loadSrc + " err.msg=" + err?.message + " err.code=" + err?.code) + onError('LoadDataShareFileClient fs.open err happened uri=' + request.loadSrc + " err.msg=" + err?.message + " err.code=" + err?.code) }) } } diff --git a/imageknife/src/main/ets/components/imageknife/utils/FastBlur.ets b/imageknife/src/main/ets/components/imageknife/utils/FastBlur.ets index 1d86b37..86961fe 100644 --- a/imageknife/src/main/ets/components/imageknife/utils/FastBlur.ets +++ b/imageknife/src/main/ets/components/imageknife/utils/FastBlur.ets @@ -30,7 +30,7 @@ export namespace fastBlur { // // Java Author: Mario Klingemann // http://incubator.quasimondo.com -// created Feburary 29, 2004 +// created February 29, 2004 // port : Yahel Bouaziz // http://www.kayenko.com // ported april 5th, 2012