fix: 考勤页面优化

1. 下拉区域扩大到上半屏(140dp),只拦截垂直不拦截水平
2. 考勤页布局优化:居中考勤状态+按钮+低耗电提示
3. 按钮固定宽度250dp,更美观
4. 添加上滑返回手势(考勤页上滑回首页)
5. 去掉底部"上滑返回"文字(已有手势)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dongliang
2026-04-28 19:53:04 +09:30
parent b59fee4bb7
commit d9ee5f2059
4 changed files with 103 additions and 73 deletions

View File

@@ -334,36 +334,43 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
}
}
/** 设置下拉手势 → 进入考勤打卡页(在状态栏区域检测) */
/**
* 设置下拉手势 → 进入考勤打卡页
* 触摸区域上半屏140dp只拦截垂直下拉水平滑动透传给 ViewPager2
*/
@android.annotation.SuppressLint("ClickableViewAccessibility")
private fun setupPullDownGesture() {
val gestureDetector = android.view.GestureDetector(
requireContext(),
object : android.view.GestureDetector.SimpleOnGestureListener() {
override fun onFling(
e1: android.view.MotionEvent?,
e2: android.view.MotionEvent,
velocityX: Float,
velocityY: Float
): Boolean {
if (e1 == null) return false
val dy = e2.y - e1.y
// 下拉手势dy > 0 且速度 > 0
if (dy > 30 && velocityY > 100) {
navigateToPunch()
return true
}
return false
}
var startY = 0f
var startX = 0f
override fun onDown(e: android.view.MotionEvent): Boolean = true
}
)
// 在状态栏上方的触摸区域检测下拉(不被 ViewPager2 拦截)
binding.pullDownArea.setOnTouchListener { _, event ->
gestureDetector.onTouchEvent(event)
true
when (event.action) {
android.view.MotionEvent.ACTION_DOWN -> {
startY = event.y
startX = event.x
true // 拦截 DOWN
}
android.view.MotionEvent.ACTION_MOVE -> {
val dy = event.y - startY
val dx = event.x - startX
// 如果水平滑动幅度 > 垂直 → 不拦截,透传给 ViewPager2
if (kotlin.math.abs(dx) > kotlin.math.abs(dy) + 10) {
false
} else {
true
}
}
android.view.MotionEvent.ACTION_UP -> {
val dy = event.y - startY
val dx = event.x - startX
// 下拉dy > 50且垂直幅度 > 水平
if (dy > 50 && kotlin.math.abs(dy) > kotlin.math.abs(dx)) {
navigateToPunch()
}
true
}
else -> false
}
}
}

View File

@@ -6,6 +6,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import com.xiaoqu.watch.R
import com.xiaoqu.watch.data.punch.PunchStatus
import com.xiaoqu.watch.databinding.FragmentPunchBinding
@@ -71,6 +72,9 @@ class PunchFragment : BaseFragment<FragmentPunchBinding>() {
// 获取考勤状态
fetchAttendance()
// 上滑返回手势
setupSwipeUpToBack()
// 监听系统状态事件
observeEvents()
}
@@ -310,4 +314,28 @@ class PunchFragment : BaseFragment<FragmentPunchBinding>() {
}
}
}
/** 上滑返回首页 */
@android.annotation.SuppressLint("ClickableViewAccessibility")
private fun setupSwipeUpToBack() {
var startY = 0f
binding.contentArea.setOnTouchListener { _, event ->
when (event.action) {
android.view.MotionEvent.ACTION_DOWN -> {
startY = event.y
true
}
android.view.MotionEvent.ACTION_UP -> {
val dy = event.y - startY
// 上滑dy < -50→ 返回
if (dy < -50) {
findNavController().popBackStack()
}
true
}
else -> true
}
}
}
}