From a8411f8f0c38ce73080789fa2a6c04cae635befd Mon Sep 17 00:00:00 2001
From: teach <teachliang@can-dao.com>
Date: Mon, 23 Mar 2020 14:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_main.xml     |  2 +-
 consecutivescroller/build.gradle              | 29 ++++++++++++++++---
 .../consecutivescroller/ScrollUtils.java      | 20 +++++++++----
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 59a046f..66d31f6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
         android:id="@+id/sample"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="基础案例" />
+        android:text="基础示例" />
 
     <Button
         android:id="@+id/sticky"
diff --git a/consecutivescroller/build.gradle b/consecutivescroller/build.gradle
index a891e42..f18eb4e 100644
--- a/consecutivescroller/build.gradle
+++ b/consecutivescroller/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
 
+group='com.github.donkingliang' // 指定group，com.github.<用户名>
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
@@ -26,9 +28,28 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+//---------------------------------------------
+
+// 指定编码
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+// 打包源码
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
 
-//    implementation 'androidx.appcompat:appcompat:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+task javadoc(type: Javadoc) {
+    failOnError  false
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    classpath += configurations.compile
 }
+
+artifacts {
+    archives sourcesJar
+}
\ No newline at end of file
diff --git a/consecutivescroller/src/main/java/com/donkingliang/consecutivescroller/ScrollUtils.java b/consecutivescroller/src/main/java/com/donkingliang/consecutivescroller/ScrollUtils.java
index 9449552..e0ade05 100644
--- a/consecutivescroller/src/main/java/com/donkingliang/consecutivescroller/ScrollUtils.java
+++ b/consecutivescroller/src/main/java/com/donkingliang/consecutivescroller/ScrollUtils.java
@@ -9,14 +9,13 @@
 import java.util.List;
 
 /**
- * @Author teach liang
+ * @Author donkingliang
  * @Description
  * @Date 2020/3/17
  */
 public class ScrollUtils {
 
     static int computeVerticalScrollOffset(View view) {
-
         try {
             Method method = View.class.getDeclaredMethod("computeVerticalScrollOffset");
             method.setAccessible(true);
@@ -28,7 +27,6 @@ static int computeVerticalScrollOffset(View view) {
     }
 
     static int computeVerticalScrollRange(View view) {
-
         try {
             Method method = View.class.getDeclaredMethod("computeVerticalScrollRange");
             method.setAccessible(true);
@@ -40,7 +38,6 @@ static int computeVerticalScrollRange(View view) {
     }
 
     static int computeVerticalScrollExtent(View view) {
-
         try {
             Method method = View.class.getDeclaredMethod("computeVerticalScrollExtent");
             method.setAccessible(true);
@@ -105,6 +102,13 @@ static boolean canScrollVertically(View view, int direction) {
         }
     }
 
+    /**
+     * 获取当前触摸点下的View
+     * @param rootView
+     * @param touchX
+     * @param touchY
+     * @return
+     */
     static List<View> getTouchViews(View rootView, int touchX, int touchY) {
         List views = new ArrayList();
         addTouchViews(views, rootView, touchX, touchY);
@@ -125,7 +129,13 @@ private static void addTouchViews(List<View> views, View view, int touchX, int t
         }
     }
 
-    //(x,y)是否在view的区域内
+    /**
+     * 判断触摸点是否在View内
+     * @param view
+     * @param x
+     * @param y
+     * @return
+     */
     static boolean isTouchPointInView(View view, int x, int y) {
         if (view == null) {
             return false;