fix-webview-touch-error

yangyufei · yangyufei · commit 3567103bcf62 · 2019-01-25T22:17:33.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         applicationId "jarvis.com.nestedtouchscrollinglayout"
         minSdkVersion 23
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,14 +20,16 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
+    //noinspection GradleCompatible
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
-    implementation 'com.android.support:recyclerview-v7:26.0.0'
-    implementation 'com.android.support:design:26.0.0'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+
 
 
     api project(':library')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="jarvis.com.nestedtouchscrollinglayout">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/AppbarLayoutActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/AppbarLayoutActivity.java
@@ -69,7 +69,7 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R
         mNestedTouchScrollingLayout = findViewById(R.id.wrapper);
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
 
             }
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/BottomSheetActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/BottomSheetActivity.java
@@ -17,6 +17,7 @@
 import android.widget.TextView;
 
 import jarvis.com.library.NestedTouchScrollingLayout;
+import jarvis.com.nestedtouchscrollinglayout.view.IndicatorLineView;
 
 /**
  * @author Jarvis.
@@ -36,6 +37,8 @@ public class BottomSheetActivity extends BaseActivity {
 
     private NestedTouchScrollingLayout mNestedTouchScrollingLayout;
 
+    private IndicatorLineView mIndicatorLineView;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,6 +51,8 @@ public void onClick(View view) {
             }
         });
 
+        mIndicatorLineView = findViewById(R.id.indicator);
+
         mContainerRecycler = findViewById(R.id.container_rv);
         mContainerRecycler.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
         mContainerRecycler.setAdapter(new InnerAdapter(this, 0x9966CC));
@@ -72,8 +77,8 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R
         mNestedTouchScrollingLayout = findViewById(R.id.wrapper);
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
-
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
+                mIndicatorLineView.updateVelocity(velocityY);
             }
 
             @Override
@@ -111,7 +116,6 @@ public void onNestChildScrollRelease(final float deltaY, final int velocityY) {
 
             @Override
             public void onFingerUp(float velocityY) {
-
             }
 
             @Override
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/RecyclerViewActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/RecyclerViewActivity.java
@@ -64,7 +64,7 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R
 
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
 
             }
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/ViewAndRecyclerViewActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/ViewAndRecyclerViewActivity.java
@@ -79,7 +79,7 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R
 
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
                 FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mWrapper.getLayoutParams();
                 params.height = (int) (DisplayUtils.dpToPixel(ViewAndRecyclerViewActivity.this, 400) + deltaY);
                 mWrapper.setLayoutParams(params);
@@ -97,7 +97,7 @@ public void run() {
 
             @Override
             public void onFingerUp(float velocityY) {
-
+                Log.e("jarivs-velocityY ----> ", "" + velocityY);
             }
 
             @Override
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/WebViewActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/WebViewActivity.java
@@ -34,13 +34,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         initWebSettings();
         initWebViewClient();
 
-        mWebView.loadUrl("https://www.baidu.com/");
+        mWebView.loadUrl("http://m.meten.com/xxl/adult.html");
 
         mContainer = findViewById(R.id.wrapper);
 
         mContainer.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
 
             }
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/WebViewAndRecyclerViewActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/WebViewAndRecyclerViewActivity.java
@@ -53,7 +53,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mWebView = findViewById(R.id.container_wb);
         initWebSettings();
         initWebViewClient();
-        mWebView.loadUrl("https://www.baidu.com/");
+        mWebView.loadUrl("http://m.meten.com/xxl/adult.html");
 
         mContainerRecycler = findViewById(R.id.container_rv);
         mContainerRecycler.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
@@ -86,7 +86,7 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R
 
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
                 FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mWebView.getLayoutParams();
                 params.height = (int) (DisplayUtils.dpToPixel(WebViewAndRecyclerViewActivity.this, 250) + deltaY);
                 mWebView.setLayoutParams(params);
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/BaseChildFragment.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/BaseChildFragment.java
@@ -28,7 +28,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mParent = (NestedTouchScrollingLayout) getChildView().getParent();
         mParent.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
 
             }
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/RecyclerViewFragment.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/RecyclerViewFragment.java
@@ -58,7 +58,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
 
             }
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/WebViewFragment.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/WebViewFragment.java
@@ -56,7 +56,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
         mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {
             @Override
-            public void onNestChildScrollChange(float deltaY) {
+            public void onNestChildScrollChange(float deltaY, float velocityY) {
 
             }
 
@@ -91,7 +91,6 @@ View getChildView() {
     private void initWebSettings() {
         WebSettings settings = this.mWebView.getSettings();
         settings.setJavaScriptEnabled(true);
-        settings.setPluginState(WebSettings.PluginState.ON);
         settings.setUseWideViewPort(true);
         settings.setLoadWithOverviewMode(true);
         settings.setSupportZoom(false);
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/view/IndicatorLineView.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/view/IndicatorLineView.java
@@ -0,0 +1,103 @@
+package jarvis.com.nestedtouchscrollinglayout.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.CornerPathEffect;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewCompat;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+import jarvis.com.nestedtouchscrollinglayout.DisplayUtils;
+
+/**
+ * @author yyf @ Zhihu Inc.
+ * @since 01-21-2019
+ */
+public class IndicatorLineView extends View {
+
+    private Paint mPaint;
+
+    private Path mPath;
+
+    public IndicatorLineView(Context context) {
+        super(context);
+        init();
+    }
+
+    public IndicatorLineView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public IndicatorLineView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        initOperator();
+    }
+
+    private void initOperator() {
+        setWillNotDraw(false);
+        mPaint = new Paint();
+        mPaint.setColor(Color.BLUE);
+        mPaint.setAlpha(255);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setStrokeCap(Paint.Cap.ROUND);
+        mPaint.setStrokeWidth(DisplayUtils.dpToPixel(getContext(), 5));
+        mPaint.setAntiAlias(true);
+        mPaint.setPathEffect(new CornerPathEffect(DisplayUtils.dpToPixel(getContext(), 5)));
+
+        mPath = new Path();
+        updatePath(0);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int sizeWidth = MeasureSpec.getSize(widthMeasureSpec);
+        int sizeHeight = MeasureSpec.getSize(heightMeasureSpec);
+        int modeWidth = MeasureSpec.getMode(widthMeasureSpec);
+        int modeHeight = MeasureSpec.getMode(heightMeasureSpec);
+        int width = DisplayUtils.dpToPixel(getContext(), 69);
+        int height = DisplayUtils.dpToPixel(getContext(), 42);
+        setMeasuredDimension(
+                (modeWidth == MeasureSpec.EXACTLY) ? sizeWidth : width,
+                (modeHeight == MeasureSpec.EXACTLY) ? sizeHeight : height);
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        canvas.drawPath(mPath, mPaint);
+    }
+
+    private void updatePath(float velocityY) {
+        if (Math.abs(velocityY) <= 300) {
+            velocityY = 0;
+        }
+        velocityY = velocityY > 3500 ? 3500 : (velocityY < -3500 ? -3500 : velocityY);
+        Log.e("updatePath ---> ", velocityY + "");
+        mPath.moveTo(DisplayUtils.dpToPixel(getContext(), 10), DisplayUtils.dpToPixel(getContext(), 16));
+        mPath.lineTo(DisplayUtils.dpToPixel(getContext(), 32),  DisplayUtils.dpToPixel(getContext(), 16 + (velocityY / 3500) * 14));
+        mPath.lineTo(DisplayUtils.dpToPixel(getContext(), 54), DisplayUtils.dpToPixel(getContext(), 16));
+    }
+
+    public void updateVelocity(float velocityY) {
+        clearPath();
+        ViewCompat.postInvalidateOnAnimation(this);
+        updatePath(velocityY);
+        ViewCompat.postInvalidateOnAnimation(this);
+    }
+
+    private void clearPath() {
+        mPath.reset();
+    }
+
+}
diff --git a/app/src/main/res/layout/activity_bottom.xml b/app/src/main/res/layout/activity_bottom.xml
@@ -24,11 +24,26 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
-            android:background="#fff"
-            android:id="@+id/container_rv"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent">
+
+            <jarvis.com.nestedtouchscrollinglayout.view.IndicatorLineView
+                android:id="@+id/indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"/>
+
+            <android.support.v7.widget.RecyclerView
+                android:background="#fff"
+                android:id="@+id/container_rv"
+                android:layout_marginTop="42dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"/>
+
+        </FrameLayout>
+
 
     </jarvis.com.library.NestedTouchScrollingLayout>
 
diff --git a/captures/demo3.gif b/captures/demo3.gif
diff --git a/library/build.gradle b/library/build.gradle
@@ -3,15 +3,15 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
 
 
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
-        versionName "1.0"
+        versionName "1.2.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -29,10 +29,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:26.0.0'
     testImplementation 'junit:junit:4.12'
 
-    api 'com.android.support:design:26.0.0'
+    //noinspection GradleCompatible
+    api 'com.android.support:appcompat-v7:27.1.1'
+    api 'com.android.support:design:27.1.1'
 
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/library/src/main/java/jarvis/com/library/NestedTouchScrollingLayout.java b/library/src/main/java/jarvis/com/library/NestedTouchScrollingLayout.java

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R`
`69`	`69`	`mNestedTouchScrollingLayout = findViewById(R.id.wrapper);`
`70`	`70`	`mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {`
`71`	`71`	`@Override`
`72`		`- public void onNestChildScrollChange(float deltaY) {`
	`72`	`+ public void onNestChildScrollChange(float deltaY, float velocityY) {`
`73`	`73`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull R`
`64`	`64`
`65`	`65`	`mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {`
`66`	`66`	`@Override`
`67`		`- public void onNestChildScrollChange(float deltaY) {`
	`67`	`+ public void onNestChildScrollChange(float deltaY, float velocityY) {`
`68`	`68`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat`
`28`	`28`	`mParent = (NestedTouchScrollingLayout) getChildView().getParent();`
`29`	`29`	`mParent.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {`
`30`	`30`	`@Override`
`31`		`- public void onNestChildScrollChange(float deltaY) {`
	`31`	`+ public void onNestChildScrollChange(float deltaY, float velocityY) {`
`32`	`32`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat`
`58`	`58`
`59`	`59`	`mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrollingLayout.INestChildScrollChange() {`
`60`	`60`	`@Override`
`61`		`- public void onNestChildScrollChange(float deltaY) {`
	`61`	`+ public void onNestChildScrollChange(float deltaY, float velocityY) {`
`62`	`62`
`63`	`63`	`}`
`64`	`64`