From 4d91c84c6b45c59ecaae88cd38eefbb560edaf97 Mon Sep 17 00:00:00 2001 From: dongliang Date: Wed, 29 Apr 2026 10:43:41 +0930 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=A7=E8=A1=8C+Toast=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 撤销是低频操作,二次确认多余。点击直接调API, 成功后Toast"撤销成功",失败Toast错误信息。 Co-Authored-By: Claude Opus 4.6 (1M context) --- .../com/xiaoqu/watch/ui/home/HomeFragment.kt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt index 5f69c84..edc2af7 100644 --- a/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt @@ -26,7 +26,6 @@ import com.xiaoqu.watch.ui.common.BaseFragment import com.xiaoqu.watch.ui.punch.PunchPanelView import com.xiaoqu.watch.ui.punch.PunchResult import com.xiaoqu.watch.ui.punch.PunchViewModel -import com.xiaoqu.watch.ui.widget.QuConfirmDialog import com.xiaoqu.watch.ui.widget.StatusBarView import com.xiaoqu.watch.util.DateUtil import dagger.hilt.android.AndroidEntryPoint @@ -57,7 +56,6 @@ class HomeFragment : BaseFragment() { // ===== 打卡面板 ===== private lateinit var punchPanel: PunchPanelView - private var confirmDialog: QuConfirmDialog? = null // ===== 主页 View 引用 ===== private lateinit var tvClock: TextView @@ -133,7 +131,6 @@ class HomeFragment : BaseFragment() { /** 初始化打卡面板 */ private fun initPunchPanel() { punchPanel = binding.punchPanel - confirmDialog = QuConfirmDialog(binding.dialogContainer) // 上班打卡 punchPanel.onPunchInClick = { @@ -145,10 +142,9 @@ class HomeFragment : BaseFragment() { punchViewModel.startPunch(1) } - // 撤销打卡 + // 撤销打卡(直接执行,成功后 Toast 提示) punchPanel.onRevokeClick = { - // 弹出确认弹窗 - showRevokeConfirm() + punchViewModel.revokePunch() } // 面板关闭时恢复 ViewPager2 滑动 @@ -157,16 +153,6 @@ class HomeFragment : BaseFragment() { } } - /** 显示撤销打卡确认弹窗 */ - private fun showRevokeConfirm() { - confirmDialog?.showText( - text = "确定撤销打卡?", - onConfirm = { - punchViewModel.revokePunch() - } - ) - } - /** 监听打卡状态变化 */ private fun observePunchState() { viewLifecycleOwner.lifecycleScope.launch {