add mcp_sim

examples/uitest/android_touch_simulator_test.go

@@ -2,10 +2,12 @@ package uitest
 
 import (
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 	"testing"
 
+	hrp "github.com/httprunner/httprunner/v5"
 	"github.com/httprunner/httprunner/v5/uixt"
 	"github.com/httprunner/httprunner/v5/uixt/option"
 	"github.com/httprunner/httprunner/v5/uixt/types"
@@ -561,3 +563,42 @@ func TestSIMInput(t *testing.T) {
 		})
 	}
 }
+
+// TestStepMultipleSIMActions tests multiple SIM actions in one test case
+func TestStepMultipleSIMActions(t *testing.T) {
+	// 创建包含多个SIM操作的测试用例
+	testCase := &hrp.TestCase{
+		Config: hrp.NewConfig("多个SIM操作组合测试").SetAndroid(option.WithUIA2(true), option.WithSerialNumber("")),
+		TestSteps: []hrp.IStep{
+			hrp.NewStep("组合SIM操作测试").
+				Android().
+				SIMClickAtPoint(0.5, 0.5).                              // 点击屏幕中心
+				Sleep(1).                                               // 等待1秒
+				SIMSwipeWithDirection("up", 0.5, 0.7, 200.0, 400.0).    // 向上滑动
+				Sleep(0.5).                                             // 等待0.5秒
+				SIMSwipeInArea("up", 0.2, 0.2, 0.6, 0.6, 350.0, 500.0). // 在区域内向下滑动
+				Sleep(0.5).                                             // 等待0.5秒
+				SIMSwipeFromPointToPoint(0.1, 0.5, 0.9, 0.5).           // 从左到右滑动
+				Sleep(0.5).                                             // 等待0.5秒
+				SIMInput("测试组合操作 Test Combination 123"),                // 仿真输入
+		},
+	}
+
+	// 运行测试用例
+	err := testCase.Dump2JSON("TestStepMultipleSIMActions.json")
+	if err != nil {
+		t.Fatalf("Failed to dump test case: %v", err)
+	}
+	defer func() {
+		// 清理生成的文件
+		_ = os.Remove("TestStepMultipleSIMActions.json")
+	}()
+
+	// 执行测试用例
+	err = hrp.NewRunner(t).Run(testCase)
+	if err != nil {
+		t.Errorf("Test case failed: %v", err)
+	}
+
+	t.Logf("Successfully executed multiple SIM actions test")
+}

internal/simulation/click_api.go

@@ -61,7 +61,7 @@ type ClickConfig struct {
 var DefaultClickConfig = ClickConfig{
 	MinDuration:  40,
 	MaxDuration:  90,
-	MinPoints:    3,
+	MinPoints:    4, // 增加最小点数从3到4，确保至少有2个MOVE事件
 	MaxPoints:    6,
 	MaxDeviation: 2.0,
 	NoiseLevel:   0.5,

internal/version/VERSION

@@ -1 +1 @@
-v5.0.0-250729
+v5.0.0-250730

uixt/android_driver_adb.go

@@ -1273,3 +1273,26 @@ func (ad *ADBDriver) SecondaryClick(x, y float64) (err error) {
 func (ad *ADBDriver) SecondaryClickBySelector(selector string, options ...option.ActionOption) (err error) {
 	return err
 }
+
+// SIMSupport interface implementation for ADBDriver
+// These methods return "not supported" errors since SIM functionality is only available in UIA2Driver
+
+func (ad *ADBDriver) SIMClickAtPoint(x, y float64, opts ...option.ActionOption) error {
+	return fmt.Errorf("SIMClickAtPoint is not supported in ADBDriver, please use UIA2Driver instead")
+}
+
+func (ad *ADBDriver) SIMSwipeWithDirection(direction string, startX, startY, minDistance, maxDistance float64, opts ...option.ActionOption) error {
+	return fmt.Errorf("SIMSwipeWithDirection is not supported in ADBDriver, please use UIA2Driver instead")
+}
+
+func (ad *ADBDriver) SIMSwipeInArea(direction string, areaStartX, areaStartY, areaEndX, areaEndY, minDistance, maxDistance float64, opts ...option.ActionOption) error {
+	return fmt.Errorf("SIMSwipeInArea is not supported in ADBDriver, please use UIA2Driver instead")
+}
+
+func (ad *ADBDriver) SIMSwipeFromPointToPoint(startX, startY, endX, endY float64, opts ...option.ActionOption) error {
+	return fmt.Errorf("SIMSwipeFromPointToPoint is not supported in ADBDriver, please use UIA2Driver instead")
+}
+
+func (ad *ADBDriver) SIMInput(text string, opts ...option.ActionOption) error {
+	return fmt.Errorf("SIMInput is not supported in ADBDriver, please use UIA2Driver instead")
+}

uixt/android_driver_uia2.go

@@ -533,7 +533,7 @@ func (ud *UIA2Driver) TouchByEvents(events []types.TouchEvent, opts ...option.Ac
 			log.Warn().Int("action", event.Action).Msg("Unknown action type, skipping")
 			continue
 		}
-
+		log.Warn().Any("actionMap", actionMap).Msg("ActionMap")
 		actions = append(actions, actionMap)
 	}
 

uixt/driver.go

@@ -15,6 +15,10 @@ var (
 	_ IDriver = (*WDADriver)(nil)
 	_ IDriver = (*HDCDriver)(nil)
 	_ IDriver = (*BrowserDriver)(nil)
+
+	// Ensure drivers implement SIMSupport interface
+	_ SIMSupport = (*UIA2Driver)(nil)
+	_ SIMSupport = (*ADBDriver)(nil)
 )
 
 // current implemeted driver: ADBDriver, UIA2Driver, WDADriver, HDCDriver
@@ -90,3 +94,13 @@ type IDriver interface {
 	// clipboard operations
 	GetPasteboard() (string, error)
 }
+
+// SIMSupport interface defines simulated interaction methods
+// Any driver that supports simulated touch and input should implement this interface
+type SIMSupport interface {
+	SIMClickAtPoint(x, y float64, opts ...option.ActionOption) error
+	SIMSwipeWithDirection(direction string, startX, startY, minDistance, maxDistance float64, opts ...option.ActionOption) error
+	SIMSwipeInArea(direction string, areaStartX, areaStartY, areaEndX, areaEndY, minDistance, maxDistance float64, opts ...option.ActionOption) error
+	SIMSwipeFromPointToPoint(startX, startY, endX, endY float64, opts ...option.ActionOption) error
+	SIMInput(text string, opts ...option.ActionOption) error
+}

uixt/mcp_tools_input.go

@@ -240,14 +240,14 @@ func (t *ToolSIMInput) Implement() server.ToolHandlerFunc {
 
 		opts := unifiedReq.Options()
 
-		// Call the underlying SIMInput method (Android UIA2 specific)
+		// Call the underlying SIMInput method (check if driver supports SIM)
-		if uia2Driver, ok := driverExt.IDriver.(*UIA2Driver); ok {
+		if simDriver, ok := driverExt.IDriver.(SIMSupport); ok {
-			err = uia2Driver.SIMInput(text, opts...)
+			err = simDriver.SIMInput(text, opts...)
 			if err != nil {
 				return NewMCPErrorResponse(fmt.Sprintf("Simulated input failed: %s", err.Error())), err
 			}
 		} else {
-			return NewMCPErrorResponse("SIMInput is only supported on Android UIA2 driver"), fmt.Errorf("unsupported driver type for SIMInput")
+			return NewMCPErrorResponse("SIMInput is not supported by the current driver"), fmt.Errorf("driver does not implement SIMSupport interface")
 		}
 
 		// Estimate segments count (this is approximate since the actual segmentation happens in the driver)

uixt/mcp_tools_swipe.go

@@ -631,14 +631,14 @@ func (t *ToolSIMSwipeDirection) Implement() server.ToolHandlerFunc {
 		// Build all options from request arguments
 		opts := unifiedReq.Options()
 
-		// Call the underlying SIMSwipeWithDirection method (Android UIA2 specific)
+		// Call the underlying SIMSwipeWithDirection method (check if driver supports SIM)
-		if uia2Driver, ok := driverExt.IDriver.(*UIA2Driver); ok {
+		if simDriver, ok := driverExt.IDriver.(SIMSupport); ok {
-			err = uia2Driver.SIMSwipeWithDirection(direction, startX, startY, minDistance, maxDistance, opts...)
+			err = simDriver.SIMSwipeWithDirection(direction, startX, startY, minDistance, maxDistance, opts...)
 			if err != nil {
 				return NewMCPErrorResponse(fmt.Sprintf("Simulated swipe failed: %s", err.Error())), err
 			}
 		} else {
-			return NewMCPErrorResponse("SIMSwipeWithDirection is only supported on Android UIA2 driver"), fmt.Errorf("unsupported driver type for SIMSwipeWithDirection")
+			return NewMCPErrorResponse("SIMSwipeWithDirection is not supported by the current driver"), fmt.Errorf("driver does not implement SIMSupport interface")
 		}
 
 		// Calculate actual distance for response (approximate)
@@ -782,14 +782,14 @@ func (t *ToolSIMSwipeInArea) Implement() server.ToolHandlerFunc {
 		// Build all options from request arguments
 		opts := unifiedReq.Options()
 
-		// Call the underlying SIMSwipeInArea method (Android UIA2 specific)
+		// Call the underlying SIMSwipeInArea method (check if driver supports SIM)
-		if uia2Driver, ok := driverExt.IDriver.(*UIA2Driver); ok {
+		if simDriver, ok := driverExt.IDriver.(SIMSupport); ok {
-			err = uia2Driver.SIMSwipeInArea(direction, areaStartX, areaStartY, areaEndX, areaEndY, minDistance, maxDistance, opts...)
+			err = simDriver.SIMSwipeInArea(direction, areaStartX, areaStartY, areaEndX, areaEndY, minDistance, maxDistance, opts...)
 			if err != nil {
 				return NewMCPErrorResponse(fmt.Sprintf("Simulated swipe in area failed: %s", err.Error())), err
 			}
 		} else {
-			return NewMCPErrorResponse("SIMSwipeInArea is only supported on Android UIA2 driver"), fmt.Errorf("unsupported driver type for SIMSwipeInArea")
+			return NewMCPErrorResponse("SIMSwipeInArea is not supported by the current driver"), fmt.Errorf("driver does not implement SIMSupport interface")
 		}
 
 		message := fmt.Sprintf("Successfully performed simulated swipe %s in area (%.2f,%.2f)-(%.2f,%.2f)",
@@ -902,14 +902,14 @@ func (t *ToolSIMSwipeFromPointToPoint) Implement() server.ToolHandlerFunc {
 		// Build all options from request arguments
 		opts := unifiedReq.Options()
 
-		// Call the underlying SIMSwipeFromPointToPoint method (Android UIA2 specific)
+		// Call the underlying SIMSwipeFromPointToPoint method (check if driver supports SIM)
-		if uia2Driver, ok := driverExt.IDriver.(*UIA2Driver); ok {
+		if simDriver, ok := driverExt.IDriver.(SIMSupport); ok {
-			err = uia2Driver.SIMSwipeFromPointToPoint(startX, startY, endX, endY, opts...)
+			err = simDriver.SIMSwipeFromPointToPoint(startX, startY, endX, endY, opts...)
 			if err != nil {
 				return NewMCPErrorResponse(fmt.Sprintf("Simulated point to point swipe failed: %s", err.Error())), err
 			}
 		} else {
-			return NewMCPErrorResponse("SIMSwipeFromPointToPoint is only supported on Android UIA2 driver"), fmt.Errorf("unsupported driver type for SIMSwipeFromPointToPoint")
+			return NewMCPErrorResponse("SIMSwipeFromPointToPoint is not supported by the current driver"), fmt.Errorf("driver does not implement SIMSupport interface")
 		}
 
 		message := fmt.Sprintf("Successfully performed simulated swipe from (%.2f,%.2f) to (%.2f,%.2f)",

uixt/mcp_tools_touch.go

@@ -392,14 +392,14 @@ func (t *ToolSIMClickAtPoint) Implement() server.ToolHandlerFunc {
 		// Build all options from request arguments
 		opts := unifiedReq.Options()
 
-		// Call the underlying SIMClickAtPoint method (Android UIA2 specific)
+		// Call the underlying SIMClickAtPoint method (check if driver supports SIM)
-		if uia2Driver, ok := driverExt.IDriver.(*UIA2Driver); ok {
+		if simDriver, ok := driverExt.IDriver.(SIMSupport); ok {
-			err = uia2Driver.SIMClickAtPoint(x, y, opts...)
+			err = simDriver.SIMClickAtPoint(x, y, opts...)
 			if err != nil {
 				return NewMCPErrorResponse(fmt.Sprintf("Simulated click failed: %s", err.Error())), err
 			}
 		} else {
-			return NewMCPErrorResponse("SIMClickAtPoint is only supported on Android UIA2 driver"), fmt.Errorf("unsupported driver type for SIMClickAtPoint")
+			return NewMCPErrorResponse("SIMClickAtPoint is not supported by the current driver"), fmt.Errorf("driver does not implement SIMSupport interface")
 		}
 
 		message := fmt.Sprintf("Successfully performed simulated click at (%.2f, %.2f)", x, y)