feat: 更新 Baseline Profile，覆盖日期检查器/调休/工具页等场景

macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt

@@ -4,10 +4,11 @@ import android.util.Log
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.uiautomator.By
+import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.Direction
+import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
 import org.junit.Assert.assertNotNull
-import org.junit.Assert.fail
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,11 +30,23 @@ import org.junit.runner.RunWith
  * `macrobenchmark/build/outputs/connected_android_test_additional_output/`
  *
  * 测试覆盖全部用户交互路径，实现全量 AOT：
- * 1. 冷启动 → 首帧渲染
+ * 1.  冷启动 → 首帧渲染
- * 2. FAB 展开 → 年视图 → 月视图
+ * 2.  显示调休切换 ON/OFF（DayCell 大规模重组 + staggered 动画）
- * 3. 日期选择 → 周视图折叠/展开
+ * 3.  CalendarPager 翻页 → "今天"按钮跳回
- * 4. 关于页 → 开源许可页
+ * 4.  跨月日期点击 → 自动跳转
- * 5. 返回主界面
+ * 5.  月视图 → 年视图切换
+ * 6.  年视图翻年 → "今年"按钮跳回
+ * 7.  年视图点击 MiniMonth 返回月视图
+ * 8.  DayCell 点击
+ * 9.  BottomCard 拖拽折叠到周视图
+ * 10. 周视图左右翻页
+ * 11. BottomCard 拖拽展开回月视图
+ * 12. 工具页面 → 日期检查器
+ * 13. DatePickerDialog 打开/确认
+ * 14. 日期检查器添加行 + 输入天数
+ * 15. 日期检查器滑动删除行
+ * 16. 关于页面 → 开源许可页面
+ * 17. 返回主界面 → CalendarPager 翻页
  */
 @RunWith(AndroidJUnit4::class)
 class BaselineProfileGenerator {
@@ -41,6 +54,22 @@ class BaselineProfileGenerator {
     @get:Rule
     val baselineProfileRule = BaselineProfileRule()
 
+    private fun MacrobenchmarkScope.safeFindFab(): UiObject2? =
+        device.wait(Until.findObject(By.res("fab_menu")), 3000)
+
+    private fun MacrobenchmarkScope.safeWaitCalendarPager(timeout: Long = 5000): UiObject2? =
+        device.wait(Until.findObject(By.res("calendar_pager")), timeout)
+
+    private fun MacrobenchmarkScope.waitForMainActivity() {
+        for (i in 1..5) {
+            val pager = device.wait(Until.findObject(By.res("calendar_pager")), 2000)
+            if (pager != null) return
+            val fab = device.wait(Until.findObject(By.res("fab_menu")), 1000)
+            if (fab != null) return
+            Thread.sleep(500)
+        }
+    }
+
     @Test
     fun generateAppStartupProfile() {
         baselineProfileRule.collect(
@@ -49,84 +78,212 @@ class BaselineProfileGenerator {
             profileBlock = {
                 val TAG = "BaselineProfile"
 
-                // 1. 冷启动：从 launcher 启动应用
+                // ── 1. 冷启动 ──────────────────────────────────────────
                 pressHome()
                 device.executeShellCommand(
                     "am start -W -n plus.rua.project/.MainActivity"
                 )
                 device.waitForIdle()
 
-                // 2. 展开 FAB 菜单，等待菜单项出现
+                // ── 2. 切换"显示调休"ON（覆盖 DayCell 大规模重组 + staggered 动画） ──
-                val fab = device.findObject(By.res("fab_menu"))
+                val fab1 = safeFindFab()
-                assertNotNull("FAB 按钮必须存在", fab)
+                assertNotNull("FAB 必须存在", fab1)
-                fab!!.click()
+                fab1!!.click()
-                val yearViewItem = device.wait(Until.findObject(By.text("年视图")), 3000)
+                device.waitForIdle()
-                Log.d(TAG, "FAB 菜单展开: yearViewItem=${yearViewItem != null}")
+                val legalHolidayOn = device.wait(
+                    Until.findObject(By.text("显示调休")), 3000
+                )
+                assertNotNull("显示调休必须出现", legalHolidayOn)
+                legalHolidayOn!!.click()
+                device.waitForIdle()
 
-                // 3. 切换到年视图（覆盖 YearGridView、YearHeader、MiniMonth 路径）
+                // ── 3. 右滑 CalendarPager → 上一个月 ──────────────────────
-                assertNotNull("年视图菜单项必须出现", yearViewItem)
+                val calendarPager = safeWaitCalendarPager(3000)
+                assertNotNull("CalendarPager 必须存在", calendarPager)
+                calendarPager!!.swipe(Direction.RIGHT, 0.8f)
+                device.waitForIdle()
+
+                // ── 4. 点击"今天"按钮跳回当月（覆盖 MonthHeader 今天按钮） ──
+                val todayBtn = device.wait(Until.findObject(By.text("今天")), 3000)
+                assertNotNull("今天按钮必须出现", todayBtn)
+                todayBtn!!.click()
+                device.waitForIdle()
+
+                // ── 5. 点击跨月日期（网格左上角 = 上月灰色日期） ──────────
+                val pagerRef = safeWaitCalendarPager(3000)
+                assertNotNull("CalendarPager 必须存在（跨月点击）", pagerRef)
+                val pagerBounds = pagerRef!!.visibleBounds
+                val colW = pagerBounds.width() / 7
+                val rowH = pagerBounds.height() / 6
+                device.click(pagerBounds.left + colW / 2, pagerBounds.top + rowH / 2)
+                device.waitForIdle()
+
+                // ── 6. 再次点击"今天"跳回当月 ────────────────────────────
+                val todayBtn2 = device.wait(Until.findObject(By.text("今天")), 3000)
+                if (todayBtn2 != null) {
+                    todayBtn2.click()
+                    device.waitForIdle()
+                }
+
+                // ── 7. 切换到年视图 ──────────────────────────────────────
+                val fab2 = safeFindFab()
+                assertNotNull("FAB 必须存在（年视图）", fab2)
+                fab2!!.click()
+                device.waitForIdle()
+                val yearViewItem = device.wait(
+                    Until.findObject(By.text("年视图")), 3000
+                )
+                assertNotNull("年视图必须出现", yearViewItem)
                 yearViewItem!!.click()
-                val yearGrid = device.wait(Until.findObject(By.res("year_grid")), 3000)
+                val yearGrid = device.wait(
-                Log.d(TAG, "年视图加载: yearGrid=${yearGrid != null}")
+                    Until.findObject(By.res("year_grid")), 3000
+                )
                 assertNotNull("YearGridView 必须加载", yearGrid)
                 device.waitForIdle()
 
-                // 4. 在年视图中滑动到不同年份（覆盖动画和分页路径）
+                // ── 8. 左滑年视图 → 下一年（HorizontalPager） ─────────────
-                yearGrid!!.swipe(Direction.UP, 0.5f)
+                yearGrid!!.swipe(Direction.LEFT, 0.8f)
                 device.waitForIdle()
-                yearGrid.swipe(Direction.DOWN, 0.5f)
+                Thread.sleep(500)
+
+                // ── 9. 尝试点击"今年"按钮跳回当前年 ──────────────────
+                val thisYearBtn = device.wait(
+                    Until.findObject(By.text("今年")), 2000
+                )
+                if (thisYearBtn != null && thisYearBtn.visibleBounds.height() > 0) {
+                    thisYearBtn.click()
+                    device.waitForIdle()
+                    Thread.sleep(500)
+                }
+
+                // ── 10. 点击当前月份 MiniMonth 返回月视图 ───────────────
+                val now = java.time.LocalDate.now()
+                val currentMonthDesc = "${now.year} 年 ${now.monthValue} 月"
+                val miniMonth = device.wait(
+                    Until.findObject(By.desc(currentMonthDesc)), 3000
+                )
+                if (miniMonth != null) {
+                    miniMonth.click()
+                } else {
+                    val yearGridRef = device.wait(Until.findObject(By.res("year_grid")), 3000)
+                    if (yearGridRef != null) {
+                        val ygBounds = yearGridRef.visibleBounds
+                        val monthW = ygBounds.width() / 3
+                        val monthH = ygBounds.height() / 4
+                        val mIdx = now.monthValue - 1
+                        device.click(
+                            ygBounds.left + (mIdx % 3) * monthW + monthW / 2,
+                            ygBounds.top + (mIdx / 3) * monthH + monthH / 2
+                        )
+                    }
+                }
+                Thread.sleep(1500)
+                device.waitForIdle()
+                safeWaitCalendarPager(5000)
                 device.waitForIdle()
 
-                // 5. 展开 FAB 并切换回月视图
+                // ── 11. 点击 DayCell ────────────────────────────────────
-                val fabForMonth = device.findObject(By.res("fab_menu"))
+                val todayCell = device.wait(
-                assertNotNull("FAB 按钮必须存在（返回月视图）", fabForMonth)
+                    Until.findObject(By.descContains("今天")), 3000
-                fabForMonth!!.click()
+                )
-                val monthViewItem = device.wait(Until.findObject(By.text("月视图")), 3000)
-                Log.d(TAG, "FAB 菜单展开: monthViewItem=${monthViewItem != null}")
-                assertNotNull("月视图菜单项必须出现", monthViewItem)
-                monthViewItem!!.click()
-                device.waitForIdle()
-
-                // 6. 等待月视图完全加载，点击某一天（覆盖 DayCell 点击路径 + 底部卡片展开）
-                device.wait(Until.findObject(By.res("calendar_pager")), 3000)
-                val todayCell = device.wait(Until.findObject(By.descContains("今天")), 3000)
                 if (todayCell != null) {
-                    Log.d(TAG, "找到今天 DayCell")
                     todayCell.click()
                 } else {
-                    // 回退：点击任意一天（15号总是存在）
+                    val calRef = safeWaitCalendarPager(3000)
-                    Log.d(TAG, "未找到今天，回退点击 15 号")
+                    if (calRef != null) {
-                    val day15 = device.findObject(By.text("15"))
+                        val cb = calRef.visibleBounds
-                    assertNotNull("DayCell 15 必须可点击", day15)
+                        device.click(cb.centerX(), cb.centerY())
-                    day15!!.click()
+                    }
                 }
                 device.waitForIdle()
 
-                // 7. 拖拽 BottomCard 触发月视图↔周视图折叠/展开
+                // ── 12. 拖拽 BottomCard 折叠到周视图 ─────────────────────
-                val bottomCard = device.findObject(By.res("bottom_card"))
+                val bottomCard = device.wait(Until.findObject(By.res("bottom_card")), 5000)
                 assertNotNull("BottomCard 必须存在", bottomCard)
-                val bounds = bottomCard!!.visibleBounds
+                val bcBounds = bottomCard!!.visibleBounds
-                val centerX = bounds.centerX()
+                val cx = bcBounds.centerX()
-                val centerY = bounds.centerY()
+                val cy = bcBounds.centerY()
-                val dragDistance = (bounds.height() * 0.4).toInt()
+                val dragDist = (bcBounds.height() * 0.4).toInt()
-                // 向上拖拽 → 折叠到周视图
+                device.drag(cx, cy, cx, cy - dragDist, 20)
-                device.drag(centerX, centerY, centerX, centerY - dragDistance, 20)
-                device.waitForIdle()
-                // 向下拖拽 → 展开到月视图
-                device.drag(centerX, centerY - dragDistance, centerX, centerY, 20)
                 device.waitForIdle()
 
-                // 8. 展开 FAB 并进入工具页面
+                // ── 13. 周视图左右翻页 ──────────────────────────────────
-                val fabForTools = device.findObject(By.res("fab_menu"))
+                val weekPager = safeWaitCalendarPager(3000)
-                assertNotNull("FAB 按钮必须存在（工具页）", fabForTools)
+                assertNotNull("周视图 CalendarPager 必须存在", weekPager)
-                fabForTools!!.click()
+                weekPager!!.swipe(Direction.LEFT, 0.5f)
-                val toolsButton = device.wait(Until.findObject(By.text("工具")), 3000)
+                device.waitForIdle()
-                Log.d(TAG, "FAB 菜单展开: toolsButton=${toolsButton != null}")
+                weekPager.swipe(Direction.RIGHT, 0.5f)
-                assertNotNull("工具菜单项必须出现", toolsButton)
+                device.waitForIdle()
+
+                // ── 14. 拖拽 BottomCard 展开回月视图 ─────────────────────
+                device.drag(cx, cy - dragDist, cx, cy, 20)
+                device.waitForIdle()
+
+                // ── 15. 切换"显示调休"OFF ────────────────────────────────
+                val fab3 = safeFindFab()
+                assertNotNull("FAB 必须存在（关闭调休）", fab3)
+                fab3!!.click()
+                device.waitForIdle()
+                val legalHolidayOff = device.wait(
+                    Until.findObject(By.text("显示调休")), 3000
+                )
+                assertNotNull("显示调休必须出现", legalHolidayOff)
+                legalHolidayOff!!.click()
+                device.waitForIdle()
+
+                // ── 16. CalendarPager 左右翻页 ──────────────────────────
+                val mainPager = safeWaitCalendarPager(5000)
+                if (mainPager != null) {
+                    mainPager.swipe(Direction.LEFT, 0.5f)
+                    device.waitForIdle()
+                    safeWaitCalendarPager(3000)?.swipe(Direction.RIGHT, 0.5f)
+                    device.waitForIdle()
+                }
+
+                // ── 17. 进入关于页面 ────────────────────────────────────
+                val fab5 = safeFindFab()
+                assertNotNull("FAB 必须存在（关于）", fab5)
+                fab5!!.click()
+                device.waitForIdle()
+                val aboutButton = device.wait(
+                    Until.findObject(By.text("关于")), 3000
+                )
+                assertNotNull("关于必须出现", aboutButton)
+                aboutButton!!.click()
+                device.waitForIdle()
+
+                // ── 18. 进入开源许可页面 ────────────────────────────────
+                val licensesButton = device.wait(
+                    Until.findObject(By.text("开放源代码许可")), 3000
+                )
+                assertNotNull("开放源代码许可按钮必须存在", licensesButton)
+                licensesButton!!.click()
+                device.waitForIdle()
+
+                // ── 19. 等待许可列表加载 ────────────────────────────────
+                device.wait(Until.findObject(By.textContains("Apache")), 2000)
+
+                // ── 20. 返回关于页 ──────────────────────────────────────
+                device.pressBack()
+                device.waitForIdle()
+
+                // ── 21. 返回主界面 ──────────────────────────────────────
+                device.pressBack()
+                device.waitForIdle()
+
+                // ── 22. 进入工具页面 ────────────────────────────────────
+                val fab4 = safeFindFab()
+                assertNotNull("FAB 必须存在（工具）", fab4)
+                fab4!!.click()
+                device.waitForIdle()
+                val toolsButton = device.wait(
+                    Until.findObject(By.text("工具")), 3000
+                )
+                assertNotNull("工具必须出现", toolsButton)
                 toolsButton!!.click()
                 device.waitForIdle()
 
-                // 9. 进入日期检查器（覆盖 DateCheckerScreen）
+                // ── 23. 进入日期检查器 ──────────────────────────────────
                 val dateCheckerEntry = device.wait(
                     Until.findObject(By.res("tool_date_checker")), 3000
                 )
@@ -134,70 +291,47 @@ class BaselineProfileGenerator {
                 dateCheckerEntry!!.click()
                 device.waitForIdle()
 
-                // 10. 点击日历图标打开 DatePickerDialog（覆盖 DatePicker）
+                // ── 24. 打开生产日期 DatePicker → 确定 ───────────────────
                 val datePickerBtn = device.wait(
                     Until.findObject(By.res("date_picker_button")), 3000
                 )
                 if (datePickerBtn != null) {
                     datePickerBtn.click()
                     device.waitForIdle()
+                    val confirmBtn = device.wait(
+                        Until.findObject(By.text("确定")), 2000
+                    )
+                    if (confirmBtn != null) {
+                        confirmBtn.click()
+                        device.waitForIdle()
+                    }
                 }
 
-                // 11. 等待 DatePickerDialog 并点击确定
+                // ── 25. FAB 添加新行 ────────────────────────────────────
-                device.wait(Until.findObject(By.text("确定")), 2000)
+                val dateCheckerFab = device.wait(
-                val confirmBtn = device.findObject(By.text("确定"))
+                    Until.findObject(By.res("date_checker_fab")), 3000
-                if (confirmBtn != null) {
+                )
-                    confirmBtn.click()
+                assertNotNull("DateChecker FAB 必须存在", dateCheckerFab)
-                    device.waitForIdle()
+                dateCheckerFab!!.click()
-                }
-
-                // 12. 点击 FAB 添加新行（覆盖 FAB + LazyColumn items 重组）
-                val dateCheckerFab = device.findObject(By.res("date_checker_fab"))
-                if (dateCheckerFab != null) {
-                    dateCheckerFab.click()
-                    device.waitForIdle()
-                }
-
-                // 13. 返回工具页
-                device.pressBack()
                 device.waitForIdle()
 
-                // 14. 返回主界面
+                // ── 26. 在新行输入天数 ──────────────────────────────────
-                device.pressBack()
+                val screenW = device.displayWidth
+                val screenH = device.displayHeight
+                device.click((screenW * 0.35f).toInt(), (screenH * 0.80f).toInt())
+                Thread.sleep(500)
+                device.executeShellCommand("input text '90'")
+                device.waitForIdle()
+                device.click(screenW / 2, (screenH * 0.15f).toInt())
                 device.waitForIdle()
 
-                // 15. 左右滑动切换月份（覆盖 CalendarPager 翻页）
+                // ── 27. 滑动删除新行（SwipeToDismiss） ───────────────────
-                val calendarPager = device.findObject(By.res("calendar_pager"))
+                device.swipe(
-                assertNotNull("CalendarPager 必须存在", calendarPager)
+                    (screenW * 0.85f).toInt(), (screenH * 0.75f).toInt(),
-                calendarPager!!.swipe(Direction.LEFT, 0.5f)
+                    (screenW * 0.15f).toInt(), (screenH * 0.75f).toInt(),
-                device.waitForIdle()
+                    30
-                calendarPager.swipe(Direction.RIGHT, 0.5f)
+                )
-                device.waitForIdle()
+                Thread.sleep(800)
-
-                // 16. 进入关于页面（覆盖 AboutScreen + AnimatedGif）
-                val fabForAbout = device.findObject(By.res("fab_menu"))
-                assertNotNull("FAB 按钮必须存在（关于页）", fabForAbout)
-                fabForAbout!!.click()
-                val aboutButton = device.wait(Until.findObject(By.text("关于")), 3000)
-                assertNotNull("关于菜单项必须出现", aboutButton)
-                aboutButton!!.click()
-                device.waitForIdle()
-
-                // 17. 进入开源许可页面（覆盖 LicensesScreen）
-                val licensesButton = device.wait(Until.findObject(By.text("开放源代码许可")), 3000)
-                assertNotNull("开放源代码许可按钮必须存在", licensesButton)
-                licensesButton!!.click()
-                device.waitForIdle()
-
-                // 18. 等待许可列表加载
-                device.wait(Until.findObject(By.textContains("Apache")), 2000)
-
-                // 19. 返回关于页
-                device.pressBack()
-                device.waitForIdle()
-
-                // 20. 返回主界面
-                device.pressBack()
                 device.waitForIdle()
 
                 Log.d(TAG, "Baseline profile 生成完成，所有路径已覆盖")

scripts/profile.sh

@@ -158,9 +158,10 @@ get_screen_center() {
     echo "$w $h"
 }
 
-# 清理后台进程
+# 清理后台进程（整棵进程树）
 cleanup_bg() {
     if [ -n "$BG_PID" ] && kill -0 "$BG_PID" 2>/dev/null; then
+        pkill -P "$BG_PID" 2>/dev/null || true
         kill "$BG_PID" 2>/dev/null || true
         wait "$BG_PID" 2>/dev/null || true
     fi
@@ -209,7 +210,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true || true
             sleep 1
             echo "  → 自动执行：trace 开始后将连续左右滑动翻页"
             wait_then_do 2 bash -c "
@@ -229,7 +230,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将依次点击日历中不同位置的日期"
             # 日历网格大致区域：7列 x 最多6行
@@ -255,7 +256,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将自动拖拽 BottomCard 上下切换"
             wait_then_do 2 bash -c "
@@ -277,7 +278,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             # 打开年视图（点击 FAB → 年视图）
             adb shell input tap "$fab_x" "$fab_y"
@@ -303,7 +304,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             # 打开年视图
             adb shell input tap "$fab_x" "$fab_y"
@@ -339,7 +340,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             # 先翻几页离开当月
             adb shell input swipe $((screen_w*20/100)) $grid_y $((screen_w*80/100)) $grid_y 200
@@ -364,7 +365,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将反复点击 FAB"
             wait_then_do 2 bash -c "
@@ -382,7 +383,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将反复切换"显示调休""
             wait_then_do 2 bash -c "
@@ -404,7 +405,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将点击首行左侧（上月）和末行右侧（下月）的灰色日期"
             local col_w=$((screen_w / 7))
@@ -433,7 +434,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${TOOLS_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${TOOLS_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：工具页面已打开，trace 期间保持静态"
             ;;
@@ -445,7 +446,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${DATECHECKER_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${DATECHECKER_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将自动添加行、输入天数、滑动删除"
             wait_then_do 2 bash -c "
@@ -487,7 +488,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${ABOUT_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${ABOUT_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：关于页面已打开，trace 期间保持静态"
             ;;
@@ -499,7 +500,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${LICENSES_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${LICENSES_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：许可页面已打开，trace 开始后将上下滑动"
             wait_then_do 2 bash -c "
@@ -519,7 +520,7 @@ run_scenario() {
             echo "[场景] ${SCENARIO_NAME}"
             echo "  ${SCENARIO_DESC}"
             echo ""
-            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1
+            adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
             sleep 1
             echo "  → 自动执行：trace 开始后将按顺序自动执行所有主要交互"
             local col_w=$((screen_w / 7))
@@ -871,7 +872,7 @@ else
     if [ "$NO_LAUNCH" = false ]; then
         echo ""
         echo "[1/5] 启动应用..."
-        adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true
+        adb shell am start -n "${PACKAGE}/${MAIN_ACTIVITY}" >/dev/null 2>&1 || true || true
         sleep 2
     else
         echo ""