diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..796b96d1c402326528b4ba3c12ee9d92d0e212e9
--- /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 96e4562aef94e92c7d3a8c6f9d5183237b5599df..64adde80ff6fd40cd96640054ebe6b3bd107c280 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 f16022f1342e26fb81993ea7fe43c62ba7adcb15..d70f1f03afdadb8def72ae5419735d4013f81335 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 98%
rename from entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java
rename to app/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java
index 75873110180054198d9bc83edf740a02049ecab5..91590b20c320c45ada97a8a3a52f200a69a3fbf2 100644
--- a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/MainAbilitySlice.java
+++ b/app/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/app/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java
similarity index 87%
rename from entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java
rename to app/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java
index 34740adf0537e9f72e70e69c3cdc7507dcd1d7cf..be0992e3002da447b3930d4ef33ba5f5f4962068 100644
--- a/entry/src/main/java/com/paradoxie/autoverticaltextview/slice/ResUtils.java
+++ b/app/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);
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 0000000000000000000000000000000000000000..f266e74231ab06a78f6bf8f9414cd03764aa6617
--- /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/autoscrolltextview/build.gradle b/autoscrolltextview/build.gradle
index ab88c3009d8c2ddd387481757f1eb81ba8c834fe..96dc353f9512f95fb0f2051dea80e8686b08ad10 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 {
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 5716a1cf6d92e2f51d338d3016c557ea0807628f..0000000000000000000000000000000000000000
--- 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 4619787de98be930f6ef4f3e951c0d696d30fd30..7096c37788f165c114fc1d608aa2e85e6d0e9244 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/settings.gradle b/settings.gradle
index 6170c08d1f8130e3678aac95425138099af3eead..c35574c86146d27224b12f6fc1c4f50cf99c5a1a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':entry', ':autoscrolltextview'
+include ':app', ':autoscrolltextview'