fix: 下拉手势改为在状态栏区域检测(避免ViewPager2拦截)

状态栏区域扩大为40dp触摸区,在此区域检测下拉手势进入考勤页

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dongliang
2026-04-28 18:38:17 +09:30
parent c812b9ee1a
commit 2d5726db9a
2 changed files with 21 additions and 12 deletions

View File

@@ -273,7 +273,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
findNavController().navigate(R.id.action_home_to_taskList, bundle)
}
/** 设置下拉手势 → 进入考勤打卡页 */
/** 设置下拉手势 → 进入考勤打卡页(在状态栏区域检测) */
@android.annotation.SuppressLint("ClickableViewAccessibility")
private fun setupPullDownGesture() {
val gestureDetector = android.view.GestureDetector(
@@ -287,21 +287,22 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
): Boolean {
if (e1 == null) return false
val dy = e2.y - e1.y
val dx = e2.x - e1.x
// 下拉dy > 0且垂直幅度 > 水平
if (dy > 80 && kotlin.math.abs(dy) > kotlin.math.abs(dx)) {
// 下拉手势dy > 0 且速度 > 0
if (dy > 30 && velocityY > 100) {
navigateToPunch()
return true
}
return false
}
override fun onDown(e: android.view.MotionEvent): Boolean = true
}
)
// 给 ViewPager2 内部的 RecyclerView 添加触摸监听
binding.viewPager.getChildAt(0)?.setOnTouchListener { _, event ->
// 在状态栏上方的触摸区域检测下拉(不被 ViewPager2 拦截)
binding.pullDownArea.setOnTouchListener { _, event ->
gestureDetector.onTouchEvent(event)
false
true
}
}