diff --git a/CHANGELOG.md b/CHANGELOG.md index b2f1f1c021b64c89111dc66f9b1fbdcf0e8abcb8..3f3252bb66badd77e9b8321e7d25fcc39fc19cdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +v1.0.4: +1.修复未加载图片时,触摸控件可能造成的崩溃问题 + v1.0.3: 1.优化绘制性能使其滑动更流畅 2.增加内存优化开关,可以根据情况是否开启,默认关闭 diff --git a/README.md b/README.md index e54ea2d8d1d96972c0faf2c0d0699dceff5b1009..21af473629f741cfdad446496478422a49637fa2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## 如何导入: ``` dependencies{ - implementation 'io.openharmony.tpc.thirdlib:subsampling-scale-image-view:1.0.3' + implementation 'io.openharmony.tpc.thirdlib:subsampling-scale-image-view:1.0.4' } ``` diff --git a/build.gradle b/build.gradle index 0ef92080e7a0959615065a3bceb579fb087c298f..98e48674e061599ad525c5b7eba31c9776fd8d81 100755 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.5' + classpath 'com.huawei.ohos:hap:2.4.4.2' classpath 'com.huawei.ohos:decctest:1.0.0.6' } } diff --git a/subscaleview/build.gradle b/subscaleview/build.gradle index a5764c7aa6332c2918bbec2e21c359ce3a240fdb..89522aeb731a1fb60b9e03d8803eaa3b781f287c 100644 --- a/subscaleview/build.gradle +++ b/subscaleview/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.huawei.ohos.library' rootProject.ext{ DEFAULT_GROUP_ID = 'io.openharmony.tpc.thirdlib' DEFAULT_ARTIFACT_ID = 'subsampling-scale-image-view' - DEFAULT_VERSION = '1.0.3' + DEFAULT_VERSION = '1.0.4' DEFAULT_GITEE_URL = "https://gitee.com/openharmony-tpc/" + rootProject.ext.DEFAULT_ARTIFACT_ID HPM_NAME = "@opensource/" + rootProject.ext.DEFAULT_ARTIFACT_ID HPM_DESCRIPTION = "Highly configurable,easily extendable deep zoom view for displaying huge images without loss of detail.Perfect for photo galleries,maps,building plans etc." diff --git a/subscaleview/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/subscaleview/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java index 857c639203e60e7e14ad48e4642391575702df81..5b2139ee50f92f93bd3f87c70eb4d751cd29d414 100644 --- a/subscaleview/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java +++ b/subscaleview/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java @@ -524,6 +524,9 @@ public class SubsamplingScaleImageView extends Component implements Component.Dr if (scaleAnimator) { return true; } + if (orgPixelMap == null) { + return false; + } if (touchEvent.getPointerCount() >= 3) { if (touchEvent.getAction() == TouchEvent.OTHER_POINT_UP || touchEvent.getAction() == TouchEvent.OTHER_POINT_UP) { @@ -547,11 +550,7 @@ public class SubsamplingScaleImageView extends Component implements Component.Dr doOneTouchDown(touchEvent); } else if (touchEvent.getAction() == TouchEvent.POINT_MOVE) { doOneTouchMove(touchEvent); - boolean toStrock = checkZoom(); invalidate(); - if (!toStrock) { - return true; - } } else if (touchEvent.getAction() == TouchEvent.PRIMARY_POINT_UP) { doOneTouchUp(touchEvent); }