Dev

hapray-gui/core/file_utils.py

@@ -4,6 +4,7 @@
 
 import logging
 import subprocess
+import sys
 from pathlib import Path
 from typing import Optional
 
@@ -72,11 +73,20 @@ def list_directories(directory: str) -> list[str]:
     def get_project_root() -> Path:
         """获取项目根目录"""
         # 从当前文件向上查找，直到找到包含特定标记文件的目录
-        current = Path(__file__).resolve()
+        # 打包后默认路径：_internal/core
+        logger.info('当前文件路径：%s', __file__)
+        current = Path(__file__).resolve().parent
+        if hasattr(sys, 'frozen') and hasattr(sys, '_MEIPASS'):
+            return current.parent.parent
+
+        # 向上遍历直到文件系统根目录（当到达根目录时，parent 等于 current）
         while current != current.parent:
-            if (current / 'hapray-gui').exists() or (current / 'perf_testing').exists():
-                return current
+            if (current / 'tools').exists() or (current / 'perf_testing').exists():
+                return current / 'dist'
             current = current.parent
+
+        # 如果找不到，记录警告并返回当前工作目录
+        logger.warning('未找到项目根目录，返回当前工作目录 ：%s', Path.cwd())
         return Path.cwd()
 
     @staticmethod

hapray-gui/core/plugin_loader.py

@@ -46,7 +46,7 @@ def __init__(self, plugins_dir: Optional[Path] = None):
                     plugins_dir = exe_dir.parent
             else:
                 # 开发环境
-                plugins_dir = Path(__file__).parent.parent.parent / 'tools'
+                plugins_dir = Path(__file__).parent.parent.parent / 'dist' / 'tools'
         self.plugins_dir = Path(plugins_dir).resolve()
         self.plugins: dict[str, BaseTool] = {}
         self.plugin_metadata: dict[str, dict[str, Any]] = {}

hapray-gui/core/result_processor.py

@@ -23,10 +23,24 @@ def __init__(self, output_dir: Optional[str] = None):
         else:
             self.output_dir = Path(self.config.get_output_dir())
 
-    def save_result(self, tool_name: str, result: ToolResult, params: dict[str, Any]) -> str:
+    def save_result(
+        self,
+        tool_name: str,
+        result: ToolResult,
+        params: dict[str, Any],
+        action_name: str = None,
+        menu_category: str = None,
+    ) -> str:
         """
         保存执行结果
 
+        Args:
+            tool_name: 工具名称
+            result: 执行结果
+            params: 参数
+            action_name: 动作名称（可选）
+            menu_category: 菜单分类（可选）
+
         Returns:
             保存的文件路径
         """
@@ -38,6 +52,8 @@ def save_result(self, tool_name: str, result: ToolResult, params: dict[str, Any]
         result_file = result_dir / 'result.json'
         result_data = {
             'tool_name': tool_name,
+            'action_name': action_name,
+            'menu_category': menu_category,
             'timestamp': timestamp,
             'success': result.success,
             'message': result.message,

hapray-gui/gui/main_window.py

@@ -219,6 +219,7 @@ def build_function_tree(self):
             'opt': '⚡',  # SO编译优化
             'static': '📱',  # 应用技术栈分析
             'symbol-recovery': '🔧',  # 符号恢复
+            'ui-compare': '📌',  # UI组件树对比
         }
 
         # 定义菜单结构映射：plugin_id -> {action_key -> display_name}
@@ -232,6 +233,7 @@ def build_function_tree(self):
                         'ui-tech-stack': '页面技术栈动态识别',
                         'update': '更新测试报告',
                         'compare': '对比报告',
+                        'ui-compare': 'UI组件树对比',
                     }
                 }
             },
@@ -280,7 +282,15 @@ def build_function_tree(self):
                         icon = action_icons.get(action_key, '⚙️')
                         action_item.setText(0, f'{icon} {display_name}')
                         action_item.setData(
-                            0, Qt.UserRole, {'type': 'action', 'plugin_id': plugin_id, 'action': action_key}
+                            0,
+                            Qt.UserRole,
+                            {
+                                'type': 'action',
+                                'plugin_id': plugin_id,
+                                'action': action_key,
+                                'action_name': display_name,
+                                'menu_category': menu_name,
+                            },
                         )
 
             # 如果一级菜单下没有子项，隐藏该菜单
@@ -308,16 +318,18 @@ def on_function_selected(self, item, column):
         elif function_type in ['plugin', 'action']:
             plugin_id = data.get('plugin_id')
             action = data.get('action')
-            self.show_tool_config(plugin_id, action)
+            action_name = data.get('action_name')
+            menu_category = data.get('menu_category')
+            self.show_tool_config(plugin_id, action, action_name, menu_category)
 
-    def show_tool_config(self, plugin_id, action=None):
+    def show_tool_config(self, plugin_id, action=None, action_name=None, menu_category=None):
         """显示工具配置界面"""
         tool = self.plugin_loader.get_plugin(plugin_id)
         if not tool:
             return
 
         # 创建工具页面
-        tool_page = ToolPage(tool)
+        tool_page = ToolPage(tool, action_name=action_name, menu_category=menu_category)
         if action and hasattr(tool_page, 'current_action') and hasattr(tool_page, 'rebuild_param_form'):
             tool_page.current_action = action
             tool_page.rebuild_param_form()

hapray-gui/gui/multi_select_combobox.py

@@ -3,7 +3,12 @@
 """
 
 from PySide6.QtCore import Qt, Signal
-from PySide6.QtWidgets import QComboBox, QListView, QStyledItemDelegate
+from PySide6.QtGui import QMouseEvent
+from PySide6.QtWidgets import QComboBox, QListView, QSizePolicy, QStyledItemDelegate
+
+from core.logger import get_logger
+
+logger = get_logger(__name__)
 
 
 class CheckableComboBox(QComboBox):
@@ -112,9 +117,19 @@ class MultiSelectComboBox(QComboBox):
     def __init__(self, parent=None):
         super().__init__(parent)
 
+        logger.debug('MultiSelectComboBox 初始化开始')
+
         # 设置为可编辑，但不允许用户输入
         self.setEditable(True)
-        self.lineEdit().setReadOnly(True)
+        line_edit = self.lineEdit()
+        line_edit.setReadOnly(True)
+        line_edit.setMinimumWidth(500)  # 设置内部 lineEdit 的最小宽度
+        # 安装事件过滤器到 lineEdit，以便处理点击事件
+        line_edit.installEventFilter(self)
+
+        # 设置控件本身的最小宽度和大小策略
+        self.setMinimumWidth(500)
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
 
         # 创建列表视图
         list_view = QListView()
@@ -128,34 +143,52 @@ def __init__(self, parent=None):
         # 初始化
         self.update_text()
 
+        logger.debug(f'MultiSelectComboBox 初始化完成，当前项目数量: {self.count()}')
+
     def handle_item_pressed(self, index):
         """处理项目点击"""
         item = self.model().itemFromIndex(index)
-        if item.checkState() == Qt.Checked:
-            item.setCheckState(Qt.Unchecked)
-        else:
-            item.setCheckState(Qt.Checked)
-        return False  # 阻止关闭下拉框
+        if item:
+            if item.checkState() == Qt.Checked:
+                item.setCheckState(Qt.Unchecked)
+            else:
+                item.setCheckState(Qt.Checked)
+        # 对于多选下拉框，点击选项后不自动关闭，让用户可以继续选择
+        # 用户点击外部区域时会自动关闭
 
     def update_text(self):
         """更新显示文本"""
+        row_count = self.model().rowCount()
+        logger.debug(f'MultiSelectComboBox.update_text 被调用，模型行数: {row_count}，控件 count: {self.count()}')
         checked_items = self.get_checked_items()
         if not checked_items:
-            self.lineEdit().setText('请选择测试用例...')
+            display_text = '请选择测试用例...'
+            self.lineEdit().setText(display_text)
+            logger.debug(f'更新显示文本为: "{display_text}"')
         elif len(checked_items) == 1:
-            self.lineEdit().setText(checked_items[0])
+            display_text = checked_items[0]
+            self.lineEdit().setText(display_text)
+            logger.debug(f'更新显示文本为: "{display_text}"')
         else:
-            self.lineEdit().setText(f'已选择 {len(checked_items)} 个测试用例')
+            display_text = f'已选择 {len(checked_items)} 个测试用例'
+            self.lineEdit().setText(display_text)
+            logger.debug(f'更新显示文本为: "{display_text}"')
 
         self.selection_changed.emit(checked_items)
 
     def get_checked_items(self) -> list[str]:
         """获取所有选中的项目"""
+        row_count = self.model().rowCount()
+        logger.debug(f'MultiSelectComboBox.get_checked_items 被调用，模型行数: {row_count}')
         checked_items = []
-        for i in range(self.model().rowCount()):
+        for i in range(row_count):
             item = self.model().item(i)
-            if item and item.checkState() == Qt.Checked:
-                checked_items.append(item.text())
+            if item:
+                if item.checkState() == Qt.Checked:
+                    checked_items.append(item.text())
+            else:
+                logger.warning(f'第 {i} 行的模型项为 None')
+        logger.debug(f'选中的项目: {checked_items}，共 {len(checked_items)} 个')
         return checked_items
 
     def set_checked_items(self, items: list[str]):
@@ -171,17 +204,61 @@ def set_checked_items(self, items: list[str]):
 
     def addItem(self, text, userData=None):
         """添加项目"""
+        logger.debug(f'MultiSelectComboBox.addItem 被调用，添加项目: {text}')
         super().addItem(text, userData)
         item = self.model().item(self.count() - 1, 0)
-        item.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
-        item.setCheckState(Qt.Unchecked)
+        if item:
+            item.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
+            item.setCheckState(Qt.Unchecked)
+            logger.debug(f'项目 "{text}" 添加成功，当前总数: {self.count()}')
+        else:
+            logger.error(f'项目 "{text}" 添加失败，无法获取模型项')
 
     def addItems(self, texts):
         """添加多个项目"""
+        logger.info(f'MultiSelectComboBox.addItems 被调用，准备添加 {len(texts)} 个项目')
+        logger.debug(f'项目列表: {texts}')
+        if not texts:
+            logger.warning('MultiSelectComboBox.addItems 接收到空列表')
         for text in texts:
             self.addItem(text)
+        logger.info(f'MultiSelectComboBox.addItems 完成，当前项目总数: {self.count()}')
 
     def clear(self):
         """清空所有项目"""
+        old_count = self.count()
+        logger.info(f'MultiSelectComboBox.clear 被调用，清空前项目数: {old_count}')
         super().clear()
+        new_count = self.count()
+        logger.info(f'MultiSelectComboBox.clear 完成，清空后项目数: {new_count}')
         self.update_text()
+
+    def showPopup(self):
+        """显示下拉框"""
+        logger.debug('MultiSelectComboBox.showPopup 被调用')
+        super().showPopup()
+
+    def hidePopup(self):
+        """隐藏下拉框"""
+        logger.debug('MultiSelectComboBox.hidePopup 被调用')
+        # 允许正常关闭下拉框（点击外部或按下 ESC 时）
+        super().hidePopup()
+
+    def eventFilter(self, obj, event):
+        """事件过滤器，处理 lineEdit 的点击事件"""
+        if (
+            obj == self.lineEdit()
+            and isinstance(event, QMouseEvent)
+            and event.type() == QMouseEvent.Type.MouseButtonPress
+            and event.button() == Qt.LeftButton
+        ):
+            # 点击 lineEdit 时显示下拉框（因为 lineEdit 是只读的，无法输入）
+            try:
+                view = self.view()
+                if not view.isVisible():
+                    logger.debug('点击 lineEdit，显示下拉框')
+                    self.showPopup()
+                    return True  # 阻止默认行为
+            except Exception as e:
+                logger.error(f'处理 lineEdit 点击事件时出错: {e}')
+        return super().eventFilter(obj, event)