From bcc59ca7a00342128389f815633925af6e9acfdc Mon Sep 17 00:00:00 2001
From: xfy <i@rua.plus>
Date: Mon, 15 Jun 2026 19:17:21 +0800
Subject: [PATCH] refactor(benchmark): remove dead code and polish comments

---
 .../main/kotlin/plus/rua/project/MainActivity.kt    |  4 ++--
 .../project/baseline/BaselineProfileGenerator.kt    | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/src/main/kotlin/plus/rua/project/MainActivity.kt b/app/src/main/kotlin/plus/rua/project/MainActivity.kt
index 970fd04..6ea86af 100644
--- a/app/src/main/kotlin/plus/rua/project/MainActivity.kt
+++ b/app/src/main/kotlin/plus/rua/project/MainActivity.kt
@@ -14,9 +14,9 @@ class MainActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            // 在首次 composition 绘制完成后报告 fully drawn，用于准确的启动时间度量。
-            ReportDrawn()
             YaYaTheme {
+                // 在主题内的首次 composition 绘制完成后报告 fully drawn，用于准确的启动时间度量。
+                ReportDrawn()
                 CalendarMonthView(
                     onNavigateToAbout = {
                         startActivityWithSlide(Intent(this, AboutActivity::class.java))
diff --git a/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt b/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt
index f05fa3c..976d642 100644
--- a/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt
+++ b/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt
@@ -55,16 +55,6 @@ class BaselineProfileGenerator {
     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(
@@ -99,7 +89,8 @@ class BaselineProfileGenerator {
                 device.waitForIdle()
 
                 // ── 4. 点击"今天"按钮跳回当月（覆盖 MonthHeader 今天按钮） ──
-                val todayBtn = device.wait(Until.findObject(By.text("今天")), 3000)
+                // 模拟器上 UI 渲染/动画较慢，使用较长超时等待按钮渲染
+                val todayBtn = device.wait(Until.findObject(By.text("今天")), 10000)
                 assertNotNull("今天按钮必须出现", todayBtn)
                 todayBtn!!.click()
                 device.waitForIdle()