diff --git a/entry/src/main/ets/pages/compressPage.ets b/entry/src/main/ets/pages/compressPage.ets index dc00e72..b6a3a92 100644 --- a/entry/src/main/ets/pages/compressPage.ets +++ b/entry/src/main/ets/pages/compressPage.ets @@ -111,7 +111,7 @@ struct CompressPage { } private cropressRecource() { var data = new Array(); - data.push($r('app.media.photo5')) + data.push($r('app.media.jpgSample')) var rename: OnRenameListener = { reName() { return "test_1.jpg"; diff --git a/entry/src/main/ets/pages/cropImagePage.ets b/entry/src/main/ets/pages/cropImagePage.ets index bb0a02f..e76daa5 100644 --- a/entry/src/main/ets/pages/cropImagePage.ets +++ b/entry/src/main/ets/pages/cropImagePage.ets @@ -23,7 +23,7 @@ import {PixelMapPack} from '@ohos/imageknife' @Component @Entry export struct CropImagePage { - private _resource: Resource= $r('app.media.demo_org'); + private _resource: Resource= $r('app.media.jpgSample'); @State x: number = 0; @State y: number = 0; @State crop_size: number = 100; diff --git a/entry/src/main/ets/pages/cropImagePage2.ets b/entry/src/main/ets/pages/cropImagePage2.ets index 02e1a06..c9bc822 100644 --- a/entry/src/main/ets/pages/cropImagePage2.ets +++ b/entry/src/main/ets/pages/cropImagePage2.ets @@ -33,14 +33,14 @@ export struct CropImagePage2 { @State height1: number = 0; @State _rotate: number = 0; @State _scale: number = 1; - private _resource: Resource = $r('app.media.bmpNet'); + private _resource: Resource = $r('app.media.bmpSample'); build() { Column() { Button('点击解析图片') .onClick(() => { - globalThis.ImageKnife.getImageKnifeContext().resourceManager.getMedia($r('app.media.bmpNet').id) + globalThis.ImageKnife.getImageKnifeContext().resourceManager.getMedia($r('app.media.bmpSample').id) .then(data => { let arrayBuffer = FileUtils.getInstance().uint8ArrayToBuffer(data); let optionx = new PixelMapCrop.Options(); diff --git a/entry/src/main/ets/pages/pngjTestCasePage.ets b/entry/src/main/ets/pages/pngjTestCasePage.ets index 3114fff..ce406f6 100644 --- a/entry/src/main/ets/pages/pngjTestCasePage.ets +++ b/entry/src/main/ets/pages/pngjTestCasePage.ets @@ -42,7 +42,7 @@ struct PngjTestCasePage { this.rootFolder = globalThis.ImageKnife.getImageKnifeContext().filesDir; - globalThis.ImageKnife.getImageKnifeContext().resourceManager.getMedia($r('app.media.Tomato').id) + globalThis.ImageKnife.getImageKnifeContext().resourceManager.getMedia($r('app.media.pngSample').id) .then(data => { this.pngSource = FileUtils.getInstance().uint8ArrayToBuffer(data); }) diff --git a/entry/src/main/ets/pages/testAllTypeImageKnifeComponentPage.ets b/entry/src/main/ets/pages/testAllTypeImageKnifeComponentPage.ets index 3a8eb84..4b065d7 100644 --- a/entry/src/main/ets/pages/testAllTypeImageKnifeComponentPage.ets +++ b/entry/src/main/ets/pages/testAllTypeImageKnifeComponentPage.ets @@ -24,8 +24,8 @@ struct TestAllTypeImageKnifeComponentPage { { loadSrc: $r('app.media.jpgSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 @@ -35,8 +35,8 @@ struct TestAllTypeImageKnifeComponentPage { { loadSrc: $r('app.media.pngSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 @@ -46,8 +46,8 @@ struct TestAllTypeImageKnifeComponentPage { { loadSrc: $r('app.media.jpgSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 @@ -57,8 +57,8 @@ struct TestAllTypeImageKnifeComponentPage { { loadSrc: $r('app.media.svgSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 @@ -68,8 +68,8 @@ struct TestAllTypeImageKnifeComponentPage { { loadSrc: $r('app.media.bmpSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 diff --git a/entry/src/main/ets/pages/transformPixelMapPage.ets b/entry/src/main/ets/pages/transformPixelMapPage.ets index f87d5e3..f03b286 100644 --- a/entry/src/main/ets/pages/transformPixelMapPage.ets +++ b/entry/src/main/ets/pages/transformPixelMapPage.ets @@ -39,7 +39,7 @@ import {PixelMapPack} from '@ohos/imageknife' */ let mRotate: number = 0; //let mUrl = "https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB" -let mUrl = $r('app.media.check_big'); +let mUrl = $r('app.media.pngSample'); @Entry @Component @@ -486,7 +486,7 @@ struct TransformPixelMapPage { */ centerCrop() { var imageKnifeOption = new RequestOption(); - imageKnifeOption.load($r('app.media.photo5')) + imageKnifeOption.load($r('app.media.jpgSample')) // imageKnifeOption.load(mUrl) .addListener((err, data) => { let result = new PixelMapPack(); diff --git a/entry/src/main/ets/pages/transformTestCasePage.ets b/entry/src/main/ets/pages/transformTestCasePage.ets index 5f73e41..1af2387 100644 --- a/entry/src/main/ets/pages/transformTestCasePage.ets +++ b/entry/src/main/ets/pages/transformTestCasePage.ets @@ -25,8 +25,8 @@ struct Index { { loadSrc: "https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83ericA1Mv66TwicuYOtbDMBcUhv1aa9RJBeAn9uURfcZD0AUGrJebAn1g2AjN0vb2E1XTET7fTuLBNmA/132", size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 @@ -36,8 +36,8 @@ struct Index { { loadSrc: "https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83ericA1Mv66TwicuYOtbDMBcUhv1aa9RJBeAn9uURfcZD0AUGrJebAn1g2AjN0vb2E1XTET7fTuLBNmA/132", size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RoundedCornersTransformation, roundedCorners:{ @@ -53,8 +53,8 @@ struct Index { { loadSrc: $r('app.media.pngSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RotateImageTransformation, rotateImage:180 @@ -64,8 +64,8 @@ struct Index { { loadSrc: $r('app.media.jpgSample'), size: { width: 300, height: 300 }, - placeholderSrc: $r('app.media.Tomato'), - errorholderSrc: $r('app.media.picture1'), + placeholderSrc: $r('app.media.jpgSample'), + errorholderSrc: $r('app.media.pngSample'), transform: { transformType:TransformType.RoundedCornersTransformation, roundedCorners:{ diff --git a/entry/src/main/resources/base/media/Avocado.png b/entry/src/main/resources/base/media/Avocado.png deleted file mode 100644 index 33dfdd7..0000000 Binary files a/entry/src/main/resources/base/media/Avocado.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Blueberry.png b/entry/src/main/resources/base/media/Blueberry.png deleted file mode 100644 index a07421e..0000000 Binary files a/entry/src/main/resources/base/media/Blueberry.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Crab.png b/entry/src/main/resources/base/media/Crab.png deleted file mode 100644 index b71a627..0000000 Binary files a/entry/src/main/resources/base/media/Crab.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Cucumber.png b/entry/src/main/resources/base/media/Cucumber.png deleted file mode 100644 index 6dd7477..0000000 Binary files a/entry/src/main/resources/base/media/Cucumber.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/IceCream.png b/entry/src/main/resources/base/media/IceCream.png deleted file mode 100644 index 13a8674..0000000 Binary files a/entry/src/main/resources/base/media/IceCream.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Index.png b/entry/src/main/resources/base/media/Index.png deleted file mode 100644 index 5c57223..0000000 Binary files a/entry/src/main/resources/base/media/Index.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/IndexGray.png b/entry/src/main/resources/base/media/IndexGray.png deleted file mode 100644 index 942eceb..0000000 Binary files a/entry/src/main/resources/base/media/IndexGray.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Kiwi.png b/entry/src/main/resources/base/media/Kiwi.png deleted file mode 100644 index 0b4b6ed..0000000 Binary files a/entry/src/main/resources/base/media/Kiwi.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Mushroom.png b/entry/src/main/resources/base/media/Mushroom.png deleted file mode 100644 index 3e984ee..0000000 Binary files a/entry/src/main/resources/base/media/Mushroom.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/NoRecord.png b/entry/src/main/resources/base/media/NoRecord.png deleted file mode 100644 index 724b2e1..0000000 Binary files a/entry/src/main/resources/base/media/NoRecord.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Onion.png b/entry/src/main/resources/base/media/Onion.png deleted file mode 100644 index 9c1c5a8..0000000 Binary files a/entry/src/main/resources/base/media/Onion.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Pitaya.png b/entry/src/main/resources/base/media/Pitaya.png deleted file mode 100644 index 2770b34..0000000 Binary files a/entry/src/main/resources/base/media/Pitaya.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Statistics.png b/entry/src/main/resources/base/media/Statistics.png deleted file mode 100644 index 28099ad..0000000 Binary files a/entry/src/main/resources/base/media/Statistics.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/StatisticsGray.png b/entry/src/main/resources/base/media/StatisticsGray.png deleted file mode 100644 index 018f9c3..0000000 Binary files a/entry/src/main/resources/base/media/StatisticsGray.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Strawberry.png b/entry/src/main/resources/base/media/Strawberry.png deleted file mode 100644 index a8d2394..0000000 Binary files a/entry/src/main/resources/base/media/Strawberry.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Switch.png b/entry/src/main/resources/base/media/Switch.png deleted file mode 100644 index 51aa0fc..0000000 Binary files a/entry/src/main/resources/base/media/Switch.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Tomato.png b/entry/src/main/resources/base/media/Tomato.png deleted file mode 100644 index 93ad983..0000000 Binary files a/entry/src/main/resources/base/media/Tomato.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/Walnut.png b/entry/src/main/resources/base/media/Walnut.png deleted file mode 100644 index 8187a42..0000000 Binary files a/entry/src/main/resources/base/media/Walnut.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/baidu.png b/entry/src/main/resources/base/media/baidu.png deleted file mode 100644 index 510f111..0000000 Binary files a/entry/src/main/resources/base/media/baidu.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/bmpNet.bmp b/entry/src/main/resources/base/media/bmpNet.bmp deleted file mode 100644 index a343af9..0000000 Binary files a/entry/src/main/resources/base/media/bmpNet.bmp and /dev/null differ diff --git a/entry/src/main/resources/base/media/bmpSample.bmp b/entry/src/main/resources/base/media/bmpSample.bmp index 94b0a91..4cbb7ee 100644 Binary files a/entry/src/main/resources/base/media/bmpSample.bmp and b/entry/src/main/resources/base/media/bmpSample.bmp differ diff --git a/entry/src/main/resources/base/media/check_big.png b/entry/src/main/resources/base/media/check_big.png deleted file mode 100644 index 3262131..0000000 Binary files a/entry/src/main/resources/base/media/check_big.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/check_big_test.png b/entry/src/main/resources/base/media/check_big_test.png deleted file mode 100644 index 64059ab..0000000 Binary files a/entry/src/main/resources/base/media/check_big_test.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/delete.png b/entry/src/main/resources/base/media/delete.png deleted file mode 100644 index f3c3705..0000000 Binary files a/entry/src/main/resources/base/media/delete.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/deletebackground.png b/entry/src/main/resources/base/media/deletebackground.png deleted file mode 100644 index 59490bd..0000000 Binary files a/entry/src/main/resources/base/media/deletebackground.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/demo_org.jpg b/entry/src/main/resources/base/media/demo_org.jpg deleted file mode 100644 index 8374680..0000000 Binary files a/entry/src/main/resources/base/media/demo_org.jpg and /dev/null differ diff --git a/entry/src/main/resources/base/media/dpgSample.dpg b/entry/src/main/resources/base/media/dpgSample.dpg index 6bf12a3..313d892 100644 Binary files a/entry/src/main/resources/base/media/dpgSample.dpg and b/entry/src/main/resources/base/media/dpgSample.dpg differ diff --git a/entry/src/main/resources/base/media/gifNet.gif b/entry/src/main/resources/base/media/gifNet.gif deleted file mode 100644 index 511f667..0000000 Binary files a/entry/src/main/resources/base/media/gifNet.gif and /dev/null differ diff --git a/entry/src/main/resources/base/media/gifSample.gif b/entry/src/main/resources/base/media/gifSample.gif index 6dab2d1..ada4075 100644 Binary files a/entry/src/main/resources/base/media/gifSample.gif and b/entry/src/main/resources/base/media/gifSample.gif differ diff --git a/entry/src/main/resources/base/media/jpgNet.jpg b/entry/src/main/resources/base/media/jpgNet.jpg deleted file mode 100644 index f430168..0000000 Binary files a/entry/src/main/resources/base/media/jpgNet.jpg and /dev/null differ diff --git a/entry/src/main/resources/base/media/jpgSample.jpg b/entry/src/main/resources/base/media/jpgSample.jpg index dad4caa..c67ad12 100644 Binary files a/entry/src/main/resources/base/media/jpgSample.jpg and b/entry/src/main/resources/base/media/jpgSample.jpg differ diff --git a/entry/src/main/resources/base/media/photo5.jpg b/entry/src/main/resources/base/media/photo5.jpg deleted file mode 100644 index ccf589d..0000000 Binary files a/entry/src/main/resources/base/media/photo5.jpg and /dev/null differ diff --git a/entry/src/main/resources/base/media/photo6.jpg b/entry/src/main/resources/base/media/photo6.jpg deleted file mode 100644 index aed456f..0000000 Binary files a/entry/src/main/resources/base/media/photo6.jpg and /dev/null differ diff --git a/entry/src/main/resources/base/media/picture1.jpg b/entry/src/main/resources/base/media/picture1.jpg deleted file mode 100644 index 8374680..0000000 Binary files a/entry/src/main/resources/base/media/picture1.jpg and /dev/null differ diff --git a/entry/src/main/resources/base/media/pngNet.png b/entry/src/main/resources/base/media/pngNet.png deleted file mode 100644 index cba0bad..0000000 Binary files a/entry/src/main/resources/base/media/pngNet.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/pngSample.png b/entry/src/main/resources/base/media/pngSample.png index bda2612..ebe1711 100644 Binary files a/entry/src/main/resources/base/media/pngSample.png and b/entry/src/main/resources/base/media/pngSample.png differ diff --git a/entry/src/main/resources/base/media/svgNet.svg b/entry/src/main/resources/base/media/svgNet.svg deleted file mode 100644 index cee5c31..0000000 --- a/entry/src/main/resources/base/media/svgNet.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - 蒙版 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/svgSample.svg b/entry/src/main/resources/base/media/svgSample.svg index 063bd30..5128434 100644 --- a/entry/src/main/resources/base/media/svgSample.svg +++ b/entry/src/main/resources/base/media/svgSample.svg @@ -1,25 +1,357 @@ - - 蒙版 + + svg1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/entry/src/main/resources/base/media/svgSample2.svg b/entry/src/main/resources/base/media/svgSample2.svg deleted file mode 100644 index cee5c31..0000000 --- a/entry/src/main/resources/base/media/svgSample2.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - 蒙版 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/tiger.jpg b/entry/src/main/resources/base/media/tiger.jpg deleted file mode 100644 index bf4f798..0000000 Binary files a/entry/src/main/resources/base/media/tiger.jpg and /dev/null differ diff --git a/entry/src/main/resources/base/media/transformBase.bmp b/entry/src/main/resources/base/media/transformBase.bmp deleted file mode 100644 index cee0930..0000000 Binary files a/entry/src/main/resources/base/media/transformBase.bmp and /dev/null differ diff --git a/entry/src/main/resources/base/media/webpSample.webp b/entry/src/main/resources/base/media/webpSample.webp new file mode 100644 index 0000000..c799b82 Binary files /dev/null and b/entry/src/main/resources/base/media/webpSample.webp differ