添加web的pid监控

omsage · May 27, 2024 · 214070c · 214070c
1 parent 692f997
commit 214070c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/android/android_util/package_util.go b/android/android_util/package_util.go
@@ -47,10 +47,10 @@ func extractPackageNames(output string) []string {
 	return packages
 }
 
-func GetCurrentPackageName(device *gadb.Device) (string, error) {
+func GetCurrentPackageNameAndPid(device *gadb.Device) (string, string, error) {
 	data, err := device.RunShellCommand("dumpsys activity top | grep ACTIVITY")
 	if err != nil {
-		return "", fmt.Errorf("exec command erro : " + "dumpsys activity top | grep ACTIVITY")
+		return "", "", fmt.Errorf("exec command erro : " + "dumpsys activity top | grep ACTIVITY")
 	}
 
 	var dataSplit []string
@@ -67,10 +67,15 @@ func GetCurrentPackageName(device *gadb.Device) (string, error) {
 
 	dataSplit = strings.Split(currentActivityLineStr, " ")
 	if len(dataSplit) > 1 {
-		dataSplit = strings.Split(dataSplit[1], "/")
-		return dataSplit[0], nil
+		packageNameSplit := strings.Split(dataSplit[1], "/")
+		for _, param := range dataSplit {
+			if strings.Contains(param, "pid=") {
+				return packageNameSplit[0], strings.ReplaceAll(param, "pid=", ""), nil
+			}
+		}
+		return packageNameSplit[0], "", nil
 	} else {
-		return "", errors.New("not get current package name")
+		return "", "", errors.New("not get current package name")
 	}
 }
 

diff --git a/android/android_util/package_util_test.go b/android/android_util/package_util_test.go
@@ -43,11 +43,11 @@ func TestGetCurrentPackageName(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-	packageName, err := GetCurrentPackageName(device)
+	packageName, pid, err := GetCurrentPackageNameAndPid(device)
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(packageName)
+	fmt.Println(packageName, pid)
 }
 
 func TestGetSerialList(t *testing.T) {

diff --git a/server/android_device_server.go b/server/android_device_server.go
@@ -67,7 +67,7 @@ func GroupAndroidPackageUrl(r *gin.Engine) {
 			}
 			return
 		}
-		packageName, err := android_util.GetCurrentPackageName(device)
+		packageName, pid, err := android_util.GetCurrentPackageNameAndPid(device)
 		if err != nil {
 			c.JSON(http.StatusOK, entity.ResponseData{
 				Data: "current package get error",
@@ -77,7 +77,10 @@ func GroupAndroidPackageUrl(r *gin.Engine) {
 			return
 		}
 		c.JSON(http.StatusOK, entity.ResponseData{
-			Data: packageName,
+			Data: map[string]string{
+				"packageName": packageName,
+				"pid":         pid,
+			},
 			Code: entity.RequestSucceed,
 		})
 	})

diff --git a/server/perf_server.go b/server/perf_server.go
@@ -451,7 +451,9 @@ func WebSocketPerf(r *gin.Engine) {
 
 								var testName = ""
 
-								if perfConfig.PackageName != "" {
+								if perfConfig.PackageName != "" && perfConfig.Pid != "" {
+									testName = fmt.Sprintf("%s_%s_%s_pid%s_%s", serialInfo.ProductDevice, serialInfo.Model, perfConfig.PackageName, perfConfig.Pid, formattedTime)
+								} else if perfConfig.PackageName != "" && perfConfig.Pid == "" {
 
 									testName = fmt.Sprintf("%s_%s_%s_%s", serialInfo.ProductDevice, serialInfo.Model, perfConfig.PackageName, formattedTime)
 
@@ -462,6 +464,8 @@ func WebSocketPerf(r *gin.Engine) {
 										ws.WriteJSON(entity.NewPerfDataError("get pid err:" + err.Error()))
 										break
 									}
+								} else if perfConfig.PackageName == "" && perfConfig.Pid != "" {
+									testName = fmt.Sprintf("%s_%s_pid%s_%s", serialInfo.ProductDevice, serialInfo.Model, perfConfig.Pid, formattedTime)
 								} else {
 									testName = fmt.Sprintf("%s_%s_%s", serialInfo.ProductDevice, serialInfo.Model, formattedTime)
 								}

diff --git a/server/scrcpy_server.go b/server/scrcpy_server.go
@@ -57,7 +57,7 @@ func WebSocketScrcpy(r *gin.Engine) {
 					if err != nil {
 						log.Error("read message steam err:", err)
 						ws.WriteJSON(entity.NewScrcpyError("read message steam err:" + err.Error()))
-						break
+						scrcpyClient.ClientStop()
 					} else {
 						if message.MessageType == entity.ScrcpyTouchType {
 							data, err1 := json.Marshal(message.Data)