From cf88ef352a4fe118a06c536187429feccef4403d Mon Sep 17 00:00:00 2001 From: litongzhou Date: Fri, 16 Apr 2021 11:07:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autoscrolltextview/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/autoscrolltextview/build.gradle b/autoscrolltextview/build.gradle index ab88c30..96dc353 100644 --- a/autoscrolltextview/build.gradle +++ b/autoscrolltextview/build.gradle @@ -1,4 +1,10 @@ apply plugin: 'com.huawei.ohos.library' +//apply from: '../upload.gradle' +rootProject.ext { + DEFAULT_GROUP_ID = 'com.gitee.chinasoft_ohos' //固定 + DEFAULT_ARTIFACT_ID = 'AutoVerticalTextview' //项目ID，填写项目名称或模块名称 + DEFAULT_VERSION = '0.0.1-SNAPSHOT' //版本号，发新版本时修改。未通过验收的需要发布SNAPSHOT版本，即在版本号末尾带上SNAPSHOT +} ohos { compileSdkVersion 5 defaultConfig { -- Gitee From 242cea18289b07c14e5bc94f6124bbceb6462db4 Mon Sep 17 00:00:00 2001 From: litongzhou Date: Sun, 25 Apr 2021 17:36:53 +0800 Subject: [PATCH 2/3] checkstyle --- .../autoscrolltextview/ApplicationTest.java | 13 ------- .../autoscrolltextview/VerticalTextview.java | 39 +++++++++++++++++++ .../slice/MainAbilitySlice.java | 3 ++ .../autoverticaltextview/slice/ResUtils.java | 26 ++++++++++++- 4 files changed, 67 insertions(+), 14 deletions(-) delete mode 100644 autoscrolltextview/src/androidTest/java/com/paradoxie/autoscrolltextview/ApplicationTest.java diff --git a/autoscrolltextview/src/androidTest/java/com/paradoxie/autoscrolltextview/ApplicationTest.java b/autoscrolltextview/src/androidTest/java/com/paradoxie/autoscrolltextview/ApplicationTest.java deleted file mode 100644 index 5716a1c..0000000 --- a/autoscrolltextview/src/androidTest/java/com/paradoxie/autoscrolltextview/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.paradoxie.autoscrolltextview; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/autoscrolltextview/src/main/java/com/paradoxie/autoscrolltextview/VerticalTextview.java b/autoscrolltextview/src/main/java/com/paradoxie/autoscrolltextview/VerticalTextview.java index 4619787..7096c37 100644 --- a/autoscrolltextview/src/main/java/com/paradoxie/autoscrolltextview/VerticalTextview.java +++ b/autoscrolltextview/src/main/java/com/paradoxie/autoscrolltextview/VerticalTextview.java @@ -17,6 +17,9 @@ import ohos.hiviewdfx.HiLogLabel; import java.util.ArrayList; +/** + * 自定义view + */ public class VerticalTextview extends DependentLayout { private static final HiLogLabel LABEL = new HiLogLabel(HiLog.DEBUG, 0x00201, "MY_TAG"); @@ -37,6 +40,11 @@ public class VerticalTextview extends DependentLayout { private boolean isFirst = true; private int layoutHeight = 20; + /** + * + * @param context + * @param attrSet + */ public VerticalTextview(Context context, AttrSet attrSet) { super(context, attrSet); mContext = context; @@ -45,14 +53,34 @@ public class VerticalTextview extends DependentLayout { makeView(); } + /** + * + * @param textSize + * @param padding + */ public void setText(int textSize, int padding){ this.setText(textSize,padding,0); } + /** + * + * @param textSize + * @param padding + * @param textColor + */ public void setText(int textSize, int padding, int textColor){ setText(textSize,padding,padding,padding,padding,textColor); } + /** + * + * @param textSize + * @param left + * @param top + * @param right + * @param bottom + * @param textColor + */ public void setText(int textSize, int left, int top, int right, int bottom, int textColor) { mTextSize = textSize; @@ -86,6 +114,10 @@ public class VerticalTextview extends DependentLayout { }); } + /** + * + * @param animDuration + */ public void setAnimTime(long animDuration) { this.animDuration = animDuration; } @@ -335,10 +367,17 @@ public class VerticalTextview extends DependentLayout { }); } + /** + * 监听 + * @param itemClickListener + */ public void setOnItemClickListener(OnItemClickListener itemClickListener) { this.itemClickListener = itemClickListener; } + /** + * 监听接口 + */ public interface OnItemClickListener { void onItemClick(int position); } diff --git a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java b/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java index 7587311..91590b2 100644 --- a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java @@ -26,6 +26,9 @@ public class MainAbilitySlice extends AbilitySlice { } + /** + * + */ public void init() { TextView = (VerticalTextview)findComponentById(ResourceTable.Id_verticalText); titleList.add("你是天上最受111"); diff --git a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java b/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java index 34740ad..be0992e 100644 --- a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java +++ b/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java @@ -11,6 +11,9 @@ import ohos.app.Context; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; +/** + * 资源工具类 + */ public class ResUtils { private static final HiLogLabel LABEL = new HiLogLabel(HiLog.DEBUG, 0x00201, "TAG"); @@ -30,23 +33,44 @@ public class ResUtils { return str; } + /** + * + * @param format + * @param args + */ public static void LogE(String format, Object... args){ HiLog.error(LABEL,format,args); } + /** + * + */ public static void LogLine(){ LogLine(""); } + /** + * + * @param log + */ public static void LogLine(String log){ HiLog.error(LABEL,"======================="+log+"============================"); } + /** + * + * @param mContext + * @param resId + * @param args + */ public static void LogEResId(Context mContext,int resId, Object... args){ HiLog.error(LABEL,getString(resId),args); } - + /** + * + * @param msg + */ public static void showToast(String msg){ DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(MyApplication.getAppContext()) .parse(ResourceTable.Layout_layout_toast, null, false); -- Gitee From 98c841d7d79839374af9ebdae14928a7b4268223 Mon Sep 17 00:00:00 2001 From: litongzhou Date: Wed, 28 Apr 2021 15:46:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.gitignore | 1 + {entry => app}/build.gradle | 1 + {entry => app}/src/main/config.json | 2 +- .../paradoxie/autoverticaltextview/MainAbility.java | 0 .../autoverticaltextview/MyApplication.java | 0 .../slice/MainAbilitySlice.java | 0 .../autoverticaltextview/slice/ResUtils.java | 0 .../src/main/resources/base/element/string.json | 0 .../base/graphic/background_ability_main.xml | 0 .../base/graphic/background_btn_element.xml | 0 .../src/main/resources/base/layout/ability_main.xml | 0 .../src/main/resources/base/layout/layout_toast.xml | 0 .../src/main/resources/base/media/icon.png | Bin .../paradoxie/autoverticaltextview/ExampleTest.java | 9 +++++++++ settings.gradle | 2 +- 15 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 app/.gitignore rename {entry => app}/build.gradle (99%) rename {entry => app}/src/main/config.json (97%) rename {entry => app}/src/main/java/com/paradoxie/autoverticaltextview/MainAbility.java (100%) rename {entry => app}/src/main/java/com/paradoxie/autoverticaltextview/MyApplication.java (100%) rename {entry => app}/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java (100%) rename {entry => app}/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java (100%) rename {entry => app}/src/main/resources/base/element/string.json (100%) rename {entry => app}/src/main/resources/base/graphic/background_ability_main.xml (100%) rename {entry => app}/src/main/resources/base/graphic/background_btn_element.xml (100%) rename {entry => app}/src/main/resources/base/layout/ability_main.xml (100%) rename {entry => app}/src/main/resources/base/layout/layout_toast.xml (100%) rename {entry => app}/src/main/resources/base/media/icon.png (100%) create mode 100644 app/src/test/java/com/paradoxie/autoverticaltextview/ExampleTest.java diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/entry/build.gradle b/app/build.gradle similarity index 99% rename from entry/build.gradle rename to app/build.gradle index 96e4562..64adde8 100644 --- a/entry/build.gradle +++ b/app/build.gradle @@ -14,4 +14,5 @@ dependencies { testCompile 'junit:junit:4.12' implementation project(':autoscrolltextview') + } diff --git a/entry/src/main/config.json b/app/src/main/config.json similarity index 97% rename from entry/src/main/config.json rename to app/src/main/config.json index f16022f..d70f1f0 100644 --- a/entry/src/main/config.json +++ b/app/src/main/config.json @@ -21,7 +21,7 @@ ], "distro": { "deliveryWithInstall": true, - "moduleName": "entry", + "moduleName": "app", "moduleType": "entry" }, "abilities": [ diff --git a/entry/src/main/java/com/paradoxie/autoverticaltextview/MainAbility.java b/app/src/main/java/com/paradoxie/autoverticaltextview/MainAbility.java similarity index 100% rename from entry/src/main/java/com/paradoxie/autoverticaltextview/MainAbility.java rename to app/src/main/java/com/paradoxie/autoverticaltextview/MainAbility.java diff --git a/entry/src/main/java/com/paradoxie/autoverticaltextview/MyApplication.java b/app/src/main/java/com/paradoxie/autoverticaltextview/MyApplication.java similarity index 100% rename from entry/src/main/java/com/paradoxie/autoverticaltextview/MyApplication.java rename to app/src/main/java/com/paradoxie/autoverticaltextview/MyApplication.java diff --git a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java b/app/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java similarity index 100% rename from entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java rename to app/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java diff --git a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java b/app/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java similarity index 100% rename from entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java rename to app/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java diff --git a/entry/src/main/resources/base/element/string.json b/app/src/main/resources/base/element/string.json similarity index 100% rename from entry/src/main/resources/base/element/string.json rename to app/src/main/resources/base/element/string.json diff --git a/entry/src/main/resources/base/graphic/background_ability_main.xml b/app/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 app/src/main/resources/base/graphic/background_ability_main.xml diff --git a/entry/src/main/resources/base/graphic/background_btn_element.xml b/app/src/main/resources/base/graphic/background_btn_element.xml similarity index 100% rename from entry/src/main/resources/base/graphic/background_btn_element.xml rename to app/src/main/resources/base/graphic/background_btn_element.xml diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/app/src/main/resources/base/layout/ability_main.xml similarity index 100% rename from entry/src/main/resources/base/layout/ability_main.xml rename to app/src/main/resources/base/layout/ability_main.xml diff --git a/entry/src/main/resources/base/layout/layout_toast.xml b/app/src/main/resources/base/layout/layout_toast.xml similarity index 100% rename from entry/src/main/resources/base/layout/layout_toast.xml rename to app/src/main/resources/base/layout/layout_toast.xml diff --git a/entry/src/main/resources/base/media/icon.png b/app/src/main/resources/base/media/icon.png similarity index 100% rename from entry/src/main/resources/base/media/icon.png rename to app/src/main/resources/base/media/icon.png diff --git a/app/src/test/java/com/paradoxie/autoverticaltextview/ExampleTest.java b/app/src/test/java/com/paradoxie/autoverticaltextview/ExampleTest.java new file mode 100644 index 0000000..f266e74 --- /dev/null +++ b/app/src/test/java/com/paradoxie/autoverticaltextview/ExampleTest.java @@ -0,0 +1,9 @@ +package com.paradoxie.autoverticaltextview; + +import org.junit.Test; + +public class ExampleTest { + @Test + public void onStart() { + } +} diff --git a/settings.gradle b/settings.gradle index 6170c08..c35574c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':entry', ':autoscrolltextview' +include ':app', ':autoscrolltextview' -- Gitee