Skip to content

Commit 4ed6731

Browse files
committed
fine tune.
1 parent cd229cc commit 4ed6731

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@
2626
android:id="@+id/contentText"
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"/>
29+
30+
<include layout="@layout/main_scroll_content"/>
2931
</LinearLayout>
3032
</ScrollView>

dragsquareimage/src/main/java/com/swifty/dragsquareimage/DraggableItemView.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.facebook.rebound.SpringConfig;
1616
import com.facebook.rebound.SpringSystem;
1717
import com.squareup.picasso.Picasso;
18-
import com.swifty.dragsquareimage.R;
1918

2019
/**
2120
* Created by xmuSistone on 2016/5/23.

dragsquareimage/src/main/java/com/swifty/dragsquareimage/DraggableSquareView.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ public void onViewPositionChanged(View changedView, int left, int top, int dx, i
173173
public boolean tryCaptureView(View child, int pointerId) {
174174
// 按下的时候,缩放到最小的级别
175175
draggingView = (DraggableItemView) child;
176+
// 手指按下的时候,需要把某些view bringToFront,否则的话,tryCapture将不按预期工作
177+
if (draggingView.isDraggable()) getParent().requestDisallowInterceptTouchEvent(true);
176178
return draggingView.isDraggable();
177179
}
178180

@@ -423,8 +425,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
423425
@Override
424426
public boolean dispatchTouchEvent(MotionEvent ev) {
425427
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
426-
// 手指按下的时候,需要把某些view bringToFront,否则的话,tryCapture将不按预期工作
427-
getParent().requestDisallowInterceptTouchEvent(true);
428428
downX = (int) ev.getX();
429429
downY = (int) ev.getY();
430430
downTime = System.currentTimeMillis();
@@ -544,7 +544,7 @@ public SparseArray<String> getImageUrls() {
544544
return stringSparseArray;
545545
}
546546

547-
public int getImageSetSize(){
547+
public int getImageSetSize() {
548548
return allStatus.length;
549549
}
550550
}

0 commit comments

Comments
 (0)