diff --git a/contacts/build.properties b/contacts/build.properties index 8b0f179..e890e5d 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 04 10:00:11 GMT 2025 +#Wed Mar 05 08:27:53 GMT 2025 stageCount=9 libraryProject= baseVersion=1.0 publishVersion=1.0.8 -buildCount=60 +buildCount=112 baseBetaVersion=1.0.9 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java index 8ab2f88..4a3758e 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java @@ -47,10 +47,10 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter 0) { // 左滑 -// float translationX = Math.max(-(editButton.getWidth() + deleteButton.getWidth()), -deltaX); -// toolLayout.setTranslationX(translationX); -// scrollTo((int) translationX, 0); -// } -// } -// break; -// case MotionEvent.ACTION_UP: -// case MotionEvent.ACTION_CANCEL: -// isDragging = false; -// if (getScrollX() <= -(editButton.getWidth())) { -// // 编辑按钮完全显示,保持按钮显示 -// smoothScrollTo(-(editButton.getWidth() + deleteButton.getWidth()), 0); -// } else { -// // 恢复原状 -// smoothScrollTo(0, 0); -// toolLayout.setTranslationX(0); -// } -// break; -// } -// return true; -// } -// }); - // 编辑按钮点击事件 editButton.setOnClickListener(new OnClickListener() { @Override @@ -127,6 +91,41 @@ public class LeftScrollView extends HorizontalScrollView { }); } + @Override + public boolean onTouchEvent(MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + LogUtils.d(TAG, "ACTION_DOWN"); + mLastX = event.getX(); + isScrolling = false; + break; + case MotionEvent.ACTION_MOVE: + //LogUtils.d(TAG, "ACTION_MOVE"); + float currentX = event.getX(); + float deltaX = mLastX - currentX; + mLastX = currentX; + if (Math.abs(deltaX) > 0) { + isScrolling = true; + } + break; + case MotionEvent.ACTION_UP: + LogUtils.d(TAG, "ACTION_UP"); + if (isScrolling) { + LogUtils.d(TAG, String.format("isScrolling \ngetScrollX() %d\neditButton.getWidth() %d", getScrollX(), editButton.getWidth())); + int scrollX = getScrollX(); + if (scrollX > editButton.getWidth()) { + smoothScrollTo(getChildAt(0).getWidth(), 0); + LogUtils.d(TAG, ">>>>>"); + } else { + smoothScrollTo(0, 0); + LogUtils.d(TAG, "<<<<<"); + } + } + break; + } + return super.onTouchEvent(event); + } + // 设置文本内容 public void setText(CharSequence text) { textView.setText(text); diff --git a/contacts/src/main/res/layout/activity_settings.xml b/contacts/src/main/res/layout/activity_settings.xml index 5c9083a..21fb238 100644 --- a/contacts/src/main/res/layout/activity_settings.xml +++ b/contacts/src/main/res/layout/activity_settings.xml @@ -1,271 +1,276 @@ - - - + android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -