From 42e2b781f90739fbbd5cbe36e159c91a62dbd9fc Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Fri, 21 May 2021 14:39:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AEcheckList=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 13 +------------ README.OPENSOURCE | 10 ++++++++++ README.md | 9 +-------- {entry => example}/.gitignore | 0 {entry => example}/build.gradle | 0 {entry => example}/src/main/config.json | 2 +- .../goodiebag/pinview/example/MainAbility.java | 1 - .../pinview/example}/MainAbilitySlice.java | 2 +- .../goodiebag/pinview/example/MyApplication.java | 0 .../src/main/resources/base/element/color.json | 0 .../src/main/resources/base/element/string.json | 0 .../base/graphic/background_ability_main.xml | 0 .../main/resources/base/layout/ability_main.xml | 0 .../src/main/resources/base/media/icon.png | Bin .../java/com/goodiebag/pinview/ExampleTest.java | 0 .../main/java/com/goodiebag/pinview/Pinview.java | 14 +++++++------- settings.gradle | 2 +- 17 files changed, 22 insertions(+), 31 deletions(-) create mode 100644 README.OPENSOURCE rename {entry => example}/.gitignore (100%) rename {entry => example}/build.gradle (100%) rename {entry => example}/src/main/config.json (97%) rename {entry => example}/src/main/java/com/goodiebag/pinview/example/MainAbility.java (83%) rename {entry/src/main/java/com/goodiebag/pinview/example/slice => example/src/main/java/com/goodiebag/pinview/example}/MainAbilitySlice.java (96%) rename {entry => example}/src/main/java/com/goodiebag/pinview/example/MyApplication.java (100%) rename {entry => example}/src/main/resources/base/element/color.json (100%) rename {entry => example}/src/main/resources/base/element/string.json (100%) rename {entry => example}/src/main/resources/base/graphic/background_ability_main.xml (100%) rename {entry => example}/src/main/resources/base/layout/ability_main.xml (100%) rename {entry => example}/src/main/resources/base/media/icon.png (100%) rename {entry => example}/src/test/java/com/goodiebag/pinview/ExampleTest.java (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dccaa77..b4cfa2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,4 @@ ## 0.0.2-SNAPSHOT * optimization: Optimize code ## 0.0.1-SNAPSHOT -* refactor: For module library Android-to-OpenHarmony -## Release v1.4 -* Merge pull request #34 from FarshidRoohi/master -* fixed issues and customize pinView method -## Release v1.3 -* added javadocs and forcekeyboard option -## Release v1.2 -* Release v1.2 -## Release v1.1 -* Release v1.1 -## Release v1.0 -* release v1.0.0 \ No newline at end of file +* refactor: For module library to openharmony \ No newline at end of file diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000..a847fa3 --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,10 @@ +[ + { + "Name": "Pinview", + "License": "Apache License", + "License File": "LICENSE", + "Version Number": "v1.4", + "Upstream URL": "https://github.com/GoodieBag/Pinview", + "Description": "实现连续的文本输入框、密码框" + } +] diff --git a/README.md b/README.md index 1c93ce5..c6e2036 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Pinview -**本项目是基于开源项目Pinview进行openharmony的移植和开发的，可以通过项目标签以及github地址（）追踪到原项目版本** - #### 项目介绍 - 项目名称：TextField工具类 @@ -9,11 +7,8 @@ - 功能：实现连续的文本输入框、密码框 - 项目移植状态：TextField光标设置图片背景未实现 - 调用差异：无 -- 基线版本：Pinview组件 Release v1.4 +- 基线版本：Release v1.4 - 开发版本：sdk5，DevEco Studio2.1 beta4 -- 项目作者和维护人：赵旭东 -- 联系方式：zhaoxudong073@chinasoftinc.com -- 原项目Doc地址： #### 效果演示 @@ -91,8 +86,6 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员：李仲 - #### 版本迭代 - 0.0.2-SNAPSHOT diff --git a/entry/.gitignore b/example/.gitignore similarity index 100% rename from entry/.gitignore rename to example/.gitignore diff --git a/entry/build.gradle b/example/build.gradle similarity index 100% rename from entry/build.gradle rename to example/build.gradle diff --git a/entry/src/main/config.json b/example/src/main/config.json similarity index 97% rename from entry/src/main/config.json rename to example/src/main/config.json index b08dbe3..9a56d24 100644 --- a/entry/src/main/config.json +++ b/example/src/main/config.json @@ -21,7 +21,7 @@ ], "distro": { "deliveryWithInstall": true, - "moduleName": "entry", + "moduleName": "example", "moduleType": "entry" }, "abilities": [ diff --git a/entry/src/main/java/com/goodiebag/pinview/example/MainAbility.java b/example/src/main/java/com/goodiebag/pinview/example/MainAbility.java similarity index 83% rename from entry/src/main/java/com/goodiebag/pinview/example/MainAbility.java rename to example/src/main/java/com/goodiebag/pinview/example/MainAbility.java index adfc962..f6f348f 100644 --- a/entry/src/main/java/com/goodiebag/pinview/example/MainAbility.java +++ b/example/src/main/java/com/goodiebag/pinview/example/MainAbility.java @@ -1,6 +1,5 @@ package com.goodiebag.pinview.example; -import com.goodiebag.pinview.example.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/goodiebag/pinview/example/slice/MainAbilitySlice.java b/example/src/main/java/com/goodiebag/pinview/example/MainAbilitySlice.java similarity index 96% rename from entry/src/main/java/com/goodiebag/pinview/example/slice/MainAbilitySlice.java rename to example/src/main/java/com/goodiebag/pinview/example/MainAbilitySlice.java index 919e69f..a6f9e6b 100644 --- a/entry/src/main/java/com/goodiebag/pinview/example/slice/MainAbilitySlice.java +++ b/example/src/main/java/com/goodiebag/pinview/example/MainAbilitySlice.java @@ -1,4 +1,4 @@ -package com.goodiebag.pinview.example.slice; +package com.goodiebag.pinview.example; import com.goodiebag.pinview.Pinview; import com.goodiebag.pinview.ResourceTable; diff --git a/entry/src/main/java/com/goodiebag/pinview/example/MyApplication.java b/example/src/main/java/com/goodiebag/pinview/example/MyApplication.java similarity index 100% rename from entry/src/main/java/com/goodiebag/pinview/example/MyApplication.java rename to example/src/main/java/com/goodiebag/pinview/example/MyApplication.java diff --git a/entry/src/main/resources/base/element/color.json b/example/src/main/resources/base/element/color.json similarity index 100% rename from entry/src/main/resources/base/element/color.json rename to example/src/main/resources/base/element/color.json diff --git a/entry/src/main/resources/base/element/string.json b/example/src/main/resources/base/element/string.json similarity index 100% rename from entry/src/main/resources/base/element/string.json rename to example/src/main/resources/base/element/string.json diff --git a/entry/src/main/resources/base/graphic/background_ability_main.xml b/example/src/main/resources/base/graphic/background_ability_main.xml similarity index 100% rename from entry/src/main/resources/base/graphic/background_ability_main.xml rename to example/src/main/resources/base/graphic/background_ability_main.xml diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/example/src/main/resources/base/layout/ability_main.xml similarity index 100% rename from entry/src/main/resources/base/layout/ability_main.xml rename to example/src/main/resources/base/layout/ability_main.xml diff --git a/entry/src/main/resources/base/media/icon.png b/example/src/main/resources/base/media/icon.png similarity index 100% rename from entry/src/main/resources/base/media/icon.png rename to example/src/main/resources/base/media/icon.png diff --git a/entry/src/test/java/com/goodiebag/pinview/ExampleTest.java b/example/src/test/java/com/goodiebag/pinview/ExampleTest.java similarity index 100% rename from entry/src/test/java/com/goodiebag/pinview/ExampleTest.java rename to example/src/test/java/com/goodiebag/pinview/ExampleTest.java diff --git a/pinview/src/main/java/com/goodiebag/pinview/Pinview.java b/pinview/src/main/java/com/goodiebag/pinview/Pinview.java index 1a031a4..c30ec2e 100644 --- a/pinview/src/main/java/com/goodiebag/pinview/Pinview.java +++ b/pinview/src/main/java/com/goodiebag/pinview/Pinview.java @@ -33,8 +33,8 @@ import java.util.ArrayList; import java.util.List; /** - * This class implements a pinview for android. - * It can be used as a widget in android to take passwords/OTP/pins etc. + * This class implements a pinview for ohos. + * It can be used as a widget in ohos to take passwords/OTP/pins etc. * It is extended from a LinearLayout, implements TextWatcher, FocusChangeListener and OnKeyListener. * Supports drawableItem/selectors as a background for each pin box. * A listener is wired up to monitor complete data entry. @@ -85,7 +85,7 @@ public class Pinview extends DirectionalLayout implements * 构造 * * @param context 上下文 - * @param attrs attrs + * @param attrs attrs */ public Pinview(Context context, AttrSet attrs) { this(context, attrs, null); @@ -95,8 +95,8 @@ public class Pinview extends DirectionalLayout implements /** * 构造 * - * @param context 上下文 - * @param attrs attrs + * @param context 上下文 + * @param attrs attrs * @param defStyleAttr defStyleAttr */ public Pinview(Context context, AttrSet attrs, String defStyleAttr) { @@ -307,7 +307,7 @@ public class Pinview extends DirectionalLayout implements * 设置光标颜色 * * @param startColor 起始 - * @param endColor 结束 + * @param endColor 结束 */ public void setCursorColor(Color startColor, Color endColor) { if (textFields == null || textFields.isEmpty()) { @@ -475,7 +475,7 @@ public class Pinview extends DirectionalLayout implements * selectFlag * * @param textField textField - * @param i3 位置 + * @param i3 位置 */ public void selectFlag(TextField textField, int i3) { if (mFlag != Constant.NUM_3) { diff --git a/settings.gradle b/settings.gradle index 68d4734..ee83bd1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':entry', ':pinview' +include ':example', ':pinview' -- Gitee From b23f77fbffa6ed2ba84090b42e9685eb9497fa73 Mon Sep 17 00:00:00 2001 From: TFStudy <3202410880@qq.com> Date: Fri, 21 May 2021 14:42:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AEcheckList=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.OPENSOURCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.OPENSOURCE b/README.OPENSOURCE index a847fa3..8b01f23 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -3,7 +3,7 @@ "Name": "Pinview", "License": "Apache License", "License File": "LICENSE", - "Version Number": "v1.4", + "Version Number": "1.4", "Upstream URL": "https://github.com/GoodieBag/Pinview", "Description": "实现连续的文本输入框、密码框" } -- Gitee