diff --git a/README.md b/README.md index 17d989e4f949736a0a84eebca59d50423691296a..fc126d52f2f3e14aca475748343ef05029cde1b3 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ allprojects { } dependencies { - compile 'com.github.1993hzw:Doodle:5.0.1' + compile 'com.github.1993hzw:Doodle:5.0.2' } ``` diff --git a/app/build.gradle b/app/build.gradle index 5c84acfca1d34c7bda166c4a791b1b63bb2e179c..c6769aa26a3f1ea02dd403eaadc8f83a4188f202 100644 --- a/app/build.gradle +++ b/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 + } } diff --git a/app/src/main/java/cn/hzw/doodledemo/ScaleGestureItemDemo.java b/app/src/main/java/cn/hzw/doodledemo/ScaleGestureItemDemo.java index f0a480096b66a903cc44d3f84fb72a9d53524725..33a8002c1102f3e31f8a6ca1444d8b798e6bf1e1 100644 --- a/app/src/main/java/cn/hzw/doodledemo/ScaleGestureItemDemo.java +++ b/app/src/main/java/cn/hzw/doodledemo/ScaleGestureItemDemo.java @@ -6,11 +6,11 @@ import android.graphics.BitmapFactory; 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 class ScaleGestureItemDemo extends Activity { } @Override - public boolean onScale(ScaleGestureDetector detector) { + public boolean onScale(ScaleGestureDetectorApi27 detector) { if (getSelectedItem() != null) { IDoodleItem item = getSelectedItem(); item.setSize(item.getSize() * detector.getScaleFactor()); diff --git a/build.gradle b/build.gradle index 491ae3c6c9f715c6b26b600cbf2fcc1d40bcd567..5c8c97782a4bd36a3faa22ab99468e41a9d68c20 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ buildscript { allprojects { repositories { jcenter() + maven { url 'https://jitpack.io' } google() } } diff --git a/doodle/build.gradle b/doodle/build.gradle index 59710f836ea4f1a57208a60e49b104907bf27c38..1d7183b905ec134ee89cbd36e48317977dcc4cc6 100644 --- a/doodle/build.gradle +++ b/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' } \ No newline at end of file diff --git a/doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java b/doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java index 884d0995341b86a8006212b8d6896370e4a7c9b4..8aa539a28af1cb657a6728e90e16e1cf5c5b5f75 100644 --- a/doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java +++ b/doodle/src/main/java/cn/hzw/doodle/DoodleOnTouchGestureListener.java @@ -5,10 +5,10 @@ import android.graphics.Path; 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 class DoodleOnTouchGestureListener extends TouchGestureDetector.OnTouchGe } @Override - public boolean onScaleBegin(ScaleGestureDetector detector) { + public boolean onScaleBegin(ScaleGestureDetectorApi27 detector) { mLastFocusX = null; mLastFocusY = null; mDoodle.enableZoomer(false); @@ -275,7 +275,7 @@ public class DoodleOnTouchGestureListener extends TouchGestureDetector.OnTouchGe 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 class DoodleOnTouchGestureListener extends TouchGestureDetector.OnTouchGe } @Override - public void onScaleEnd(ScaleGestureDetector detector) { + public void onScaleEnd(ScaleGestureDetectorApi27 detector) { if (mDoodle.getDoodleScale() < 1) { // if (mScaleAnimator == null) { mScaleAnimator = new ValueAnimator(); diff --git a/gradle.properties b/gradle.properties index c33a1126beefaca1b88836ef875870f6ff0d099b..f74526eee9b0da76b48fa216403b6685536fb467 100644 --- a/gradle.properties +++ b/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