From 80a12b2e5ab717f01919d937ab9b1d8c77056dcd Mon Sep 17 00:00:00 2001 From: liangguirong Date: Mon, 4 Dec 2023 16:51:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E6=A0=B8=E5=BF=83=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=90=8C=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangguirong --- README.md | 2 +- build-profile.json5 | 4 ++-- entry/oh-package.json5 | 4 ++-- {RoundedImageView => library}/.gitignore | 0 {RoundedImageView => library}/build-profile.json5 | 0 {RoundedImageView => library}/hvigorfile.ts | 0 {RoundedImageView => library}/index.ets | 0 {RoundedImageView => library}/oh-package.json5 | 4 ++-- .../src/main/ets/components/DownloadUtils.ts | 0 .../src/main/ets/components/FileUtils.ts | 0 .../src/main/ets/components/GlobalContext.ts | 0 .../src/main/ets/components/PixelMapUtils.ts | 0 .../src/main/ets/components/RoundedImageView.ets | 0 .../src/main/ets/components/ScaleType.ts | 0 .../src/main/ets/components/SrcType.ts | 0 .../src/main/ets/components/TileMode.ts | 0 {RoundedImageView => library}/src/main/module.json5 | 4 ++-- .../src/main/resources/base/element/string.json | 0 .../src/main/resources/en_US/element/string.json | 0 .../src/main/resources/zh_CN/element/string.json | 0 20 files changed, 9 insertions(+), 9 deletions(-) rename {RoundedImageView => library}/.gitignore (100%) rename {RoundedImageView => library}/build-profile.json5 (100%) rename {RoundedImageView => library}/hvigorfile.ts (100%) rename {RoundedImageView => library}/index.ets (100%) rename {RoundedImageView => library}/oh-package.json5 (92%) rename {RoundedImageView => library}/src/main/ets/components/DownloadUtils.ts (100%) rename {RoundedImageView => library}/src/main/ets/components/FileUtils.ts (100%) rename {RoundedImageView => library}/src/main/ets/components/GlobalContext.ts (100%) rename {RoundedImageView => library}/src/main/ets/components/PixelMapUtils.ts (100%) rename {RoundedImageView => library}/src/main/ets/components/RoundedImageView.ets (100%) rename {RoundedImageView => library}/src/main/ets/components/ScaleType.ts (100%) rename {RoundedImageView => library}/src/main/ets/components/SrcType.ts (100%) rename {RoundedImageView => library}/src/main/ets/components/TileMode.ts (100%) rename {RoundedImageView => library}/src/main/module.json5 (74%) rename {RoundedImageView => library}/src/main/resources/base/element/string.json (100%) rename {RoundedImageView => library}/src/main/resources/en_US/element/string.json (100%) rename {RoundedImageView => library}/src/main/resources/zh_CN/element/string.json (100%) diff --git a/README.md b/README.md index b52b27e..a654e86 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ OpenHarmony ohpm 环境配置等更多内容，请参考[如何安装 OpenHarmon ``` |---- RoundedImageView | |---- entry # 示例代码文件夹 -| |---- RoundedImageView # RoundedImageView库文件夹 +| |---- library # RoundedImageView核心库文件夹 | |---- src | |---- main | |---- ets diff --git a/build-profile.json5 b/build-profile.json5 index 416203c..47f4f64 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -24,8 +24,8 @@ ] }, { - "name": "RoundedImageView", - "srcPath": "./RoundedImageView" + "name": "library", + "srcPath": "./library" } ] } \ No newline at end of file diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index cf9f489..61258a7 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -6,6 +6,6 @@ "repository": {}, "version": "2.0.1", "dependencies": { - "@ohos/roundedimageview": "file:../RoundedImageView" + "@ohos/roundedimageview": "file:../library" } -} +} \ No newline at end of file diff --git a/RoundedImageView/.gitignore b/library/.gitignore similarity index 100% rename from RoundedImageView/.gitignore rename to library/.gitignore diff --git a/RoundedImageView/build-profile.json5 b/library/build-profile.json5 similarity index 100% rename from RoundedImageView/build-profile.json5 rename to library/build-profile.json5 diff --git a/RoundedImageView/hvigorfile.ts b/library/hvigorfile.ts similarity index 100% rename from RoundedImageView/hvigorfile.ts rename to library/hvigorfile.ts diff --git a/RoundedImageView/index.ets b/library/index.ets similarity index 100% rename from RoundedImageView/index.ets rename to library/index.ets diff --git a/RoundedImageView/oh-package.json5 b/library/oh-package.json5 similarity index 92% rename from RoundedImageView/oh-package.json5 rename to library/oh-package.json5 index ec4ae81..1e53c7f 100644 --- a/RoundedImageView/oh-package.json5 +++ b/library/oh-package.json5 @@ -8,7 +8,7 @@ "HarmonyOS" ], "author": "hihope", - "name": "@ohos/roundedimageview", + "name": "library", "description": "RoundedImageView支持许多附加功能，包括椭圆、圆角矩形、ScaleTypes 和 TileModes", "main": "index.ets", "repository": "https://gitee.com/openharmony-sig/RoundedImageView", @@ -16,4 +16,4 @@ "dependencies": { "@ohos/svg": "2.0.0" } -} +} \ No newline at end of file diff --git a/RoundedImageView/src/main/ets/components/DownloadUtils.ts b/library/src/main/ets/components/DownloadUtils.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/DownloadUtils.ts rename to library/src/main/ets/components/DownloadUtils.ts diff --git a/RoundedImageView/src/main/ets/components/FileUtils.ts b/library/src/main/ets/components/FileUtils.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/FileUtils.ts rename to library/src/main/ets/components/FileUtils.ts diff --git a/RoundedImageView/src/main/ets/components/GlobalContext.ts b/library/src/main/ets/components/GlobalContext.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/GlobalContext.ts rename to library/src/main/ets/components/GlobalContext.ts diff --git a/RoundedImageView/src/main/ets/components/PixelMapUtils.ts b/library/src/main/ets/components/PixelMapUtils.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/PixelMapUtils.ts rename to library/src/main/ets/components/PixelMapUtils.ts diff --git a/RoundedImageView/src/main/ets/components/RoundedImageView.ets b/library/src/main/ets/components/RoundedImageView.ets similarity index 100% rename from RoundedImageView/src/main/ets/components/RoundedImageView.ets rename to library/src/main/ets/components/RoundedImageView.ets diff --git a/RoundedImageView/src/main/ets/components/ScaleType.ts b/library/src/main/ets/components/ScaleType.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/ScaleType.ts rename to library/src/main/ets/components/ScaleType.ts diff --git a/RoundedImageView/src/main/ets/components/SrcType.ts b/library/src/main/ets/components/SrcType.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/SrcType.ts rename to library/src/main/ets/components/SrcType.ts diff --git a/RoundedImageView/src/main/ets/components/TileMode.ts b/library/src/main/ets/components/TileMode.ts similarity index 100% rename from RoundedImageView/src/main/ets/components/TileMode.ts rename to library/src/main/ets/components/TileMode.ts diff --git a/RoundedImageView/src/main/module.json5 b/library/src/main/module.json5 similarity index 74% rename from RoundedImageView/src/main/module.json5 rename to library/src/main/module.json5 index 657c11a..0204bcb 100644 --- a/RoundedImageView/src/main/module.json5 +++ b/library/src/main/module.json5 @@ -1,10 +1,10 @@ { "module": { - "name": "RoundedImageView", + "name": "library", "type": "har", "deviceTypes": [ "default", "tablet" ] } -} +} \ No newline at end of file diff --git a/RoundedImageView/src/main/resources/base/element/string.json b/library/src/main/resources/base/element/string.json similarity index 100% rename from RoundedImageView/src/main/resources/base/element/string.json rename to library/src/main/resources/base/element/string.json diff --git a/RoundedImageView/src/main/resources/en_US/element/string.json b/library/src/main/resources/en_US/element/string.json similarity index 100% rename from RoundedImageView/src/main/resources/en_US/element/string.json rename to library/src/main/resources/en_US/element/string.json diff --git a/RoundedImageView/src/main/resources/zh_CN/element/string.json b/library/src/main/resources/zh_CN/element/string.json similarity index 100% rename from RoundedImageView/src/main/resources/zh_CN/element/string.json rename to library/src/main/resources/zh_CN/element/string.json -- Gitee From a665bde0a3371473e7280a172f9396bd502f0bc7 Mon Sep 17 00:00:00 2001 From: liangguirong Date: Thu, 7 Dec 2023 15:47:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9README.OpenSource?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=ADLicense=E5=92=8COwner=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangguirong --- README.OpenSource | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.OpenSource b/README.OpenSource index f4374e0..3cc7936 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -1,10 +1,10 @@ [ { "Name": "RoundedImageView", - "License": "View license", + "License": "Apache License 2.0 ", "License File": " LICENSE ", "Version Number": "2.3.0", - "Owner" : "Vincent Mi" + "Owner" : "xiafeng@huawei.com" "Upstream URL": "https://github.com/vinc3m1/RoundedImageView", "Description": "A fast ImageView (and Drawable) that supports rounded corners (and ovals or circles) based on the original example from Romain Guy. It supports many additional features including ovals, rounded rectangles, ScaleTypes and TileModes." } -- Gitee