v5.0.2:修复低版本的系统上手势识别异常的问题

Author: huangziwei

README.md

@@ -50,7 +50,7 @@ allprojects {
 }
  
 dependencies {
-    compile 'com.github.1993hzw:Doodle:5.0.1'
+    compile 'com.github.1993hzw:Doodle:5.0.2'
 }
 ```
 

app/build.gradle

@@ -22,5 +22,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':doodle')
-    compile 'cn.hzw.imageselector:library:1.0'
+    compile ('cn.hzw.imageselector:library:1.0'){
+        transitive = false
+    }
 }

app/src/main/java/cn/hzw/doodledemo/ScaleGestureItemDemo.java

@@ -6,11 +6,11 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.ScaleGestureDetector;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import cn.forward.androids.ScaleGestureDetectorApi27;
 import cn.hzw.doodle.DoodleColor;
 import cn.hzw.doodle.DoodleOnTouchGestureListener;
 import cn.hzw.doodle.DoodlePen;
@@ -108,7 +108,7 @@ public ScaleItemOnTouchGestureListener(DoodleView doodle, ISelectionListener lis
         }
 
         @Override
-        public boolean onScale(ScaleGestureDetector detector) {
+        public boolean onScale(ScaleGestureDetectorApi27 detector) {
             if (getSelectedItem() != null) {
                 IDoodleItem item = getSelectedItem();
                 item.setSize(item.getSize() * detector.getScaleFactor());

build.gradle

@@ -11,6 +11,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url 'https://jitpack.io' }
         google()
     }
 }

doodle/build.gradle

@@ -19,5 +19,5 @@ android {
 
 dependencies {
     // https://github.com/1993hzw/Androids
-    compile 'com.forward.androids:androids:1.2.1'
+    compile 'com.github.1993hzw:Androids:1.2.2'
 }

doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java

@@ -5,10 +5,10 @@
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
 
 import java.util.List;
 
+import cn.forward.androids.ScaleGestureDetectorApi27;
 import cn.forward.androids.TouchGestureDetector;
 import cn.hzw.doodle.core.IDoodle;
 import cn.hzw.doodle.core.IDoodleItem;
@@ -265,7 +265,7 @@ public boolean onSingleTapUp(MotionEvent e) {
     }
 
     @Override
-    public boolean onScaleBegin(ScaleGestureDetector detector) {
+    public boolean onScaleBegin(ScaleGestureDetectorApi27 detector) {
         mLastFocusX = null;
         mLastFocusY = null;
         mDoodle.enableZoomer(false);
@@ -275,7 +275,7 @@ public boolean onScaleBegin(ScaleGestureDetector detector) {
     private float pendingX, pendingY, pendingScale = 1;
 
     @Override
-    public boolean onScale(ScaleGestureDetector detector) {
+    public boolean onScale(ScaleGestureDetectorApi27 detector) {
         // 屏幕上的焦点
         mTouchCentreX = detector.getFocusX();
         mTouchCentreY = detector.getFocusY();
@@ -310,7 +310,7 @@ public boolean onScale(ScaleGestureDetector detector) {
     }
 
     @Override
-    public void onScaleEnd(ScaleGestureDetector detector) {
+    public void onScaleEnd(ScaleGestureDetectorApi27 detector) {
         if (mDoodle.getDoodleScale() < 1) { //
             if (mScaleAnimator == null) {
                 mScaleAnimator = new ValueAnimator();

gradle.properties

@@ -1,6 +1,6 @@
 MIN_SDK_VERSION=14
 TARGET_SDK_VERSION=27
 
-VERSION_NAME=5.0
-VERSION_CODE=20
+VERSION_NAME=5.0.2
+VERSION_CODE=22
 COMPILE_SDK_VERSION=27