fix: 修复 PDD 页面误判与失败回执 (#35)

client/src/pdd_collect_service.py

@@ -764,21 +764,30 @@ class PddCollectService:
             raise PddCollectError("DEVICE_APP_START_FAILED", f"无法打开 PDD 商品链接：{exc}") from exc
 
         deadline = self._monotonic() + self._page_timeout
-        last_labels: list[str] = []
         while self._monotonic() < deadline:
             self._check_cancelled()
             current = device.app_current()
-            if current.get("package") == PDD_PACKAGE_NAME:
-                xml_data = device.dump_hierarchy()
-                root = _parse_xml(xml_data)
-                last_labels = _all_labels(root)
+            xml_data = device.dump_hierarchy()
+            self._last_goods_xml = str(xml_data)
+            self._goods_screens_checked += 1
+            root = _parse_xml(xml_data)
+            last_labels = _all_labels(root)
+            pdd_node_count = sum(
+                1
+                for node in root.iter("node")
+                if node.get("package") == PDD_PACKAGE_NAME
+            )
+            # 部分 OPPO/ColorOS 设备会一直把无线调试设置页报告为焦点，
+            # 即使屏幕和无障碍树已经是 PDD。此时以树中真实包名为准。
+            is_pdd_hierarchy = pdd_node_count >= 3
+            is_pdd_focused = current.get("package") == PDD_PACKAGE_NAME
+            if is_pdd_focused or is_pdd_hierarchy:
                 _raise_special_page(last_labels)
                 combined = " ".join(last_labels)
                 loading = "加载中" in combined or "正在加载" in combined
                 if not loading and any(marker in combined for marker in _READY_MARKERS):
                     return
             self._sleep(0.5)
-        _raise_special_page(last_labels)
         raise PddCollectError("PDD_PAGE_TIMEOUT", "等待 PDD 商品详情页加载超时")
 
     def _collect_goods_details(self, device: Any) -> GoodsSnapshot: