From fd1be79de602294b36e46601c5df846484b8e9c2 Mon Sep 17 00:00:00 2001
From: zhangchen <yuguangye@huawei.com>
Date: Tue, 8 Jun 2021 11:40:30 +0800
Subject: [PATCH] fixed bugs

---
 CHANGELOG.md                                               | 3 +++
 README.md                                                  | 2 +-
 build.gradle                                               | 2 +-
 subscaleview/build.gradle                                  | 2 +-
 .../labs/subscaleview/SubsamplingScaleImageView.java       | 7 +++----
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2f1f1c..3f3252b 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 e54ea2d..21af473 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 0ef9208..98e4867 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 a5764c7..89522ae 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 857c639..5b2139e 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);
             }
-- 
Gitee