v2.6.1: quick launch with fallback

hubble.py

@@ -308,8 +308,57 @@ def run_hubble_sync(raw_input_text, scratch_dir, log, progress, stop_event=None)
         except: pass
 
 
+def _quick_launch(sess, log, progress, check_stop):
+    """快速尝试: 直接 am start intent, 不暖机. 返回 True=成功 False=白屏需兜底."""
+    log("[快速] 尝试直接启动 (不暖机)...")
+    progress(22)
+    check_stop()
+
+    # 先 force-stop 再启动
+    sess.sh(f"am force-stop {DST_PKG}", check=False)
+    time.sleep(2)
+
+    intent = INTENT_TEMPLATE.format(dst=DST_PKG, url=CERT_URL)
+    sess.sh(f'am start "{intent}"', check=False)
+    log("      intent 已发送, 等待 15s...")
+    progress(30)
+
+    for i in range(15):
+        check_stop()
+        time.sleep(1)
+        progress(30 + i)
+
+    # 验证: top activity + WebView 日志
+    top = sess.sh(
+        "dumpsys activity activities | grep topResumedActivity | head -1",
+        check=False,
+    ).strip()
+
+    if "LiveDummyActivity" not in top:
+        log("      [快速] Activity 不在前台, 需兜底")
+        return False
+
+    # 检查 WebView 实例是否创建 (cr_AwContents / cr_TTPlugin)
+    pid = sess.sh(
+        f"ps -ef | grep {DST_PKG} | grep -v grep | head -1 | awk '{{print $2}}'",
+        check=False,
+    ).strip()
+    if pid:
+        wv = sess.sh(
+            f"logcat -d --pid={pid} 2>/dev/null | grep -iE 'cr_AwContents|cr_TTPlugin' | tail -1",
+            check=False, timeout=10,
+        ).strip()
+        if wv:
+            log("      [快速] WebView 已创建, 成功!")
+            return True
+
+    # Activity 在前台但 WebView 未检测到 — 可能白屏
+    log("      [快速] WebView 未检测到, 可能白屏, 进入兜底...")
+    return False
+
+
 def run_hubble_launch(raw_input_text, scratch_dir, log, progress, stop_event=None):
-    """仅暖机+启动, 不同步数据 (用于重试白屏)."""
+    """先快速直接启动, 失败则暖机+轮询兜底."""
     def check_stop():
         if stop_event and stop_event.is_set():
             raise HubbleError("用户已中断")
@@ -320,10 +369,19 @@ def run_hubble_launch(raw_input_text, scratch_dir, log, progress, stop_event=Non
 
     sess = _init_session(raw_input_text, log, progress, check_stop)
     try:
-        _do_launch(sess, log, progress, check_stop, pct_start=20, pct_end=97)
+        # 第一轮: 快速尝试
+        if _quick_launch(sess, log, progress, check_stop):
+            progress(95)
+            png = _screenshot(sess, scratch_dir, log)
+            log("\n=== 快速启动成功 ===")
+            progress(100)
+            return True, png, None
+
+        # 第二轮: 完整暖机兜底
+        log("[兜底] 进入完整暖机+轮询流程...")
+        _do_launch(sess, log, progress, check_stop, pct_start=50, pct_end=97)
         png = _screenshot(sess, scratch_dir, log)
-        log("\n=== Hubble 启动页面完成 ===")
-        log("请查看截图确认是否成功.")
+        log("\n=== Hubble 启动页面完成 (兜底) ===")
         progress(100)
         return True, png, None
     finally: