From 1c5cc1547b97bd4bddd48cc69c42007e51dd29db Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Fri, 11 Jul 2025 15:50:30 +0800
Subject: [PATCH 1/2] fix: print step end logs

---
 runner.go | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/runner.go b/runner.go
index a1f13c4a..a93c96f1 100644
--- a/runner.go
+++ b/runner.go
@@ -878,9 +878,6 @@ func (r *SessionRunner) RunStep(step IStep) (stepResult *StepResult, err error)
 		}
 	}
 
-	stepName := step.Name()
-	stepType := string(step.Type())
-
 	// execute step with parameters iterator
 	tasks, err := r.generateExecutionTasks(step)
 	if err != nil {
@@ -899,30 +896,10 @@ func (r *SessionRunner) RunStep(step IStep) (stepResult *StepResult, err error)
 				r.sessionVariables[k] = v
 			}
 		}
-
-		// log final result
-		if err == nil && stepResult.Success {
-			log.Info().Str("step", stepName).
-				Str("type", stepType).
-				Bool("success", true).
-				Int64("elapsed(ms)", stepResult.Elapsed).
-				Interface("exportVars", stepResult.ExportVars).
-				Msg(RUN_STEP_END)
-		} else if stepResult != nil {
-			log.Error().Str("step", stepName).
-				Str("type", stepType).
-				Bool("success", false).
-				Int64("elapsed(ms)", stepResult.Elapsed).
-				Int("completed_tasks", len(stepResults)).
-				Int("total_tasks", len(tasks)).
-				Msg(RUN_STEP_END)
-		}
 	}()
 
 	// execute with loops as outer iteration
 	for _, task := range tasks {
-		log.Info().Str("step", task.stepName).Str("type", stepType).Msg(RUN_STEP_START)
-
 		// Check for interrupt signal before each parameter iteration
 		select {
 		case <-r.caseRunner.hrpRunner.interruptSignal:
@@ -967,6 +944,24 @@ func (r *SessionRunner) RunStep(step IStep) (stepResult *StepResult, err error)
 // executeStepWithVariables executes a single step with given parameters
 // parameters will override step variables with the same name
 func (r *SessionRunner) executeStepWithVariables(step IStep, stepName string, parameters map[string]interface{}) (stepResult *StepResult, err error) {
+	stepType := string(step.Type())
+	log.Info().Str("step", stepName).Str("type", stepType).Msg(RUN_STEP_START)
+	defer func() {
+		if err == nil && stepResult.Success {
+			log.Info().Str("step", stepName).
+				Str("type", stepType).
+				Bool("success", true).
+				Int64("elapsed(ms)", stepResult.Elapsed).
+				Msg(RUN_STEP_END)
+		} else {
+			log.Error().Str("step", stepName).
+				Str("type", stepType).
+				Bool("success", false).
+				Int64("elapsed(ms)", stepResult.Elapsed).
+				Msg(RUN_STEP_END)
+		}
+	}()
+
 	stepConfig := step.Config()
 
 	// backup original variables

From 4c418f918309544313f7dfac59eb50ab0a1b6197 Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Fri, 11 Jul 2025 16:10:46 +0800
Subject: [PATCH 2/2] change: get wda screen scale

---
 uixt/ios_driver_wda.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/uixt/ios_driver_wda.go b/uixt/ios_driver_wda.go
index c2735e55..61414503 100644
--- a/uixt/ios_driver_wda.go
+++ b/uixt/ios_driver_wda.go
@@ -275,14 +275,14 @@ func (wd *WDADriver) Scale() (float64, error) {
 }
 
 type Screen struct {
-	StatusBarSize types.Size `json:"statusBarSize"`
-	Scale         float64    `json:"scale"`
+	types.Size
+	Scale float64 `json:"scale"`
 }
 
 func (wd *WDADriver) Screen() (screen Screen, err error) {
-	// [[FBRoute GET:@"/wda/screen"] respondWithTarget:self action:@selector(handleGetScreen:)]
+	// [[FBRoute GET:@"/wings/window/size"] respondWithTarget:self action:@selector(handleGetScreen:)]
 	var rawResp DriverRawResponse
-	if rawResp, err = wd.Session.GET("/wda/screen"); err != nil {
+	if rawResp, err = wd.Session.GET("/wings/window/size"); err != nil {
 		return Screen{}, err
 	}
 	reply := new(struct{ Value struct{ Screen } })