修改bug 修改方法

yangchaojiang · Mar 30, 2021 · e45614c · e45614c
1 parent 751412e
commit e45614c
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 8 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/ImagePreview/build.gradle b/ImagePreview/build.gradle
@@ -49,7 +49,7 @@ publish {
     repoName = "yangjiang" //仓库名
     groupId = 'com.ycjiang'
     artifactId = 'ImagePreview'
-    publishVersion = '2.3.5'
+    publishVersion = '2.3.7'
     desc = 'The project by the Google official demo Zooming a View inspired to achieve a click on the thumbnail zoom to full screen preview, \' +\n' +
             '                \'exit the full screen to restore the original location of the two processes of the animation transition.\' +\n' +
             '                \' Common application scenes such as WeChat friends circle photo Jiugongge and WeChat chat picture preview, some mobile phone system album, \' +\n' +

diff --git a/ImagePreview/src/main/java/com/previewlibrary/GPreviewBuilder.java b/ImagePreview/src/main/java/com/previewlibrary/GPreviewBuilder.java
@@ -126,6 +126,7 @@ public GPreviewBuilder setType(@NonNull IndicatorType indicatorType) {
     }
 
     /***
+     * @deprecated  use {@link #isDisableDrag(boolean) }
      * 设置图片禁用拖拽返回
      * @param isDrag  true  可以 false 默认 true
      * @return GPreviewBuilder
@@ -134,12 +135,35 @@ public GPreviewBuilder setDrag(boolean isDrag) {
         intent.putExtra("isDrag", isDrag);
         return this;
     }
+    /***
+     * 设置图片禁用拖拽返回
+     * @param isDrag  true  可以 false 默认 true
+     * @return GPreviewBuilder
+     * **/
+    public GPreviewBuilder isDisableDrag(boolean isDrag) {
+        intent.putExtra("isDrag", isDrag);
+        return this;
+    }
+
+    /***
+     * 设置图片禁用拖拽返回
+     * @param isDrag  true  可以 false 默认 true
+     * @param sensitivity   sensitivity MAX_TRANS_SCALE 的值来控制灵敏度。
+     * @return GPreviewBuilder
+     * **/
+    public GPreviewBuilder isDisableDrag(boolean isDrag, float sensitivity) {
+        intent.putExtra("isDrag", isDrag);
+        intent.putExtra("sensitivity", sensitivity);
+        return this;
+    }
 
     /***
+     * @deprecated  use {@link #isDisableDrag(boolean,float) }
      * 设置图片禁用拖拽返回
      * @param isDrag  true  可以 false 默认 true
      * @param sensitivity   sensitivity MAX_TRANS_SCALE 的值来控制灵敏度。
      * @return GPreviewBuilder
+     *
      * **/
     public GPreviewBuilder setDrag(boolean isDrag, float sensitivity) {
         intent.putExtra("isDrag", isDrag);

diff --git a/ImagePreview/src/main/java/com/previewlibrary/view/BasePhotoFragment.java b/ImagePreview/src/main/java/com/previewlibrary/view/BasePhotoFragment.java
@@ -260,6 +260,7 @@ public static int getColorWithAlpha(float alpha, int baseColor) {
     }
 
     public void transformIn() {
+        assert imageView != null;
         imageView.transformIn(new SmoothImageView.onTransformListener() {
             @Override
             public void onTransformCompleted(SmoothImageView.Status status) {
@@ -269,6 +270,7 @@ public void onTransformCompleted(SmoothImageView.Status status) {
     }
 
     public void transformOut(SmoothImageView.onTransformListener listener) {
+        assert imageView != null;
         imageView.transformOut(listener);
     }
 

diff --git a/ImagePreview/src/main/java/uk/co/senab2/photoview2/PhotoViewAttacher.java b/ImagePreview/src/main/java/uk/co/senab2/photoview2/PhotoViewAttacher.java
@@ -184,7 +184,7 @@ public PhotoViewAttacher(ImageView imageView, boolean zoomable) {
                     // forward long click listener
                     @Override
                     public void onLongPress(MotionEvent e) {
-                        if (null != mLongClickListener&&getImageView().getY()==0&& getImageView().getX()==0) {
+                        if (null!=getImageView()&&null != mLongClickListener&&getImageView().getY()==0&& getImageView().getX()==0) {
                            mLongClickListener.onLongClick(getImageView());
                         }
                     }

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 通过Gradle抓取:
 
 ```grade
-  compile 'com.ycjiang:ImagePreview:2.3.5'
+  compile 'com.ycjiang:ImagePreview:2.3.7'
 ```
 
 ###  1.本项目类库依赖第三库，（）

diff --git a/app/src/main/java/com/example/previewpicture/custom/GridViewCustomActivity.java b/app/src/main/java/com/example/previewpicture/custom/GridViewCustomActivity.java
@@ -64,7 +64,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                             .setUserFragment(UserFragment.class)
                             .setCurrentIndex(position)
                             .setSingleFling(false)
-                            .setDrag(false)
+                            .isDisableDrag(false)
                             .setType(GPreviewBuilder.IndicatorType.Dot)
                             .start();
                 }

diff --git a/app/src/main/java/com/example/previewpicture/list/ListView2Activity.java b/app/src/main/java/com/example/previewpicture/list/ListView2Activity.java
@@ -43,7 +43,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 GPreviewBuilder.from(ListView2Activity.this)
                         .setData(mThumbViewInfoList)
                         .setCurrentIndex(position)
-                        .setDrag(true,0.6f)
+                        .isDisableDrag(true,0.6f)
                         .setType(GPreviewBuilder.IndicatorType.Number)
                         .start();
             }