fix minitouch not working on HUAWEI and realme device error

Author: codeskyblue

go.mod

@@ -57,3 +57,5 @@ replace (
 	github.com/qiniu/log v0.0.0-20140728010919-a304a74568d6 => github.com/gobuild/log v1.0.0
 	golang.org/x/net v0.0.0-20181114220301-adae6a3d119a => github.com/golang/net v0.0.0-20181114220301-adae6a3d119a
 )
+
+go 1.13

httpserver.go

@@ -895,43 +895,43 @@ func (server *Server) initHTTPServer() {
 			wsWrite(websocket.TextMessage, []byte("@minitouch service start failed: "+err.Error()))
 			return
 		}
-		unixSocketName := "@minitouchagent"
-		wsWrite(websocket.TextMessage, []byte("dial unix:"+unixSocketName))
+		unixSocketPath := minitouchSocketPath
+		wsWrite(websocket.TextMessage, []byte("dial unix:"+unixSocketPath))
 		log.Printf("minitouch connection: %v", r.RemoteAddr)
 		retries := 0
 		quitC := make(chan bool, 2)
 		operC := make(chan TouchRequest, 10)
 		defer func() {
-			wsWrite(websocket.TextMessage, []byte(unixSocketName+" websocket closed"))
+			wsWrite(websocket.TextMessage, []byte(unixSocketPath+" websocket closed"))
 			close(operC)
 		}()
 		go func() {
 			for {
 				if retries > 10 {
-					log.Printf("unix %s connect failed", unixSocketName)
-					wsWrite(websocket.TextMessage, []byte(unixSocketName+" listen timeout, possibly minitouch not installed"))
+					log.Printf("unix %s connect failed", unixSocketPath)
+					wsWrite(websocket.TextMessage, []byte(unixSocketPath+" listen timeout, possibly minitouch not installed"))
 					ws.Close()
 					break
 				}
-				conn, err := net.Dial("unix", unixSocketName)
+				conn, err := net.Dial("unix", unixSocketPath)
 				if err != nil {
 					retries++
-					log.Printf("dial %s error: %v, wait 0.5s", unixSocketName, err)
+					log.Printf("dial %s error: %v, wait 0.5s", unixSocketPath, err)
 					select {
 					case <-quitC:
 						return
 					case <-time.After(500 * time.Millisecond):
 					}
 					continue
 				}
-				log.Printf("unix %s connected, accepting requests", unixSocketName)
+				log.Printf("unix %s connected, accepting requests", unixSocketPath)
 				retries = 0 // connected, reset retries
 				err = drainTouchRequests(conn, operC)
 				conn.Close()
 				if err != nil {
 					log.Println("drain touch requests err:", err)
 				} else {
-					log.Printf("unix %s disconnected", unixSocketName)
+					log.Printf("unix %s disconnected", unixSocketPath)
 					break // operC closed
 				}
 			}

main.go

@@ -576,8 +576,15 @@ func main() {
 
 	service.Add("minitouch", cmdctrl.CommandInfo{
 		ArgsFunc: func() ([]string, error) {
+			sdk, err := strconv.Atoi(getCachedProperty("ro.build.version.sdk"))
+			if err != nil || sdk <= 28 { // Android P(sdk:28)
+				minitouchSocketPath = "@minitouch"
+				return []string{"/data/local/tmp/minitouch"}, nil
+			}
+			minitouchSocketPath = "@minitouchagent"
 			pmPathOutput, err := Command{
-				Args: []string{"pm", "path", "com.github.uiautomator"},
+				Args:  []string{"pm", "path", "com.github.uiautomator"},
+				Shell: true,
 			}.CombinedOutputString()
 			if err != nil {
 				return nil, err
@@ -587,7 +594,6 @@ func main() {
 			}
 			packagePath := strings.TrimSpace(pmPathOutput[len("package:"):])
 			return []string{"CLASSPATH=" + packagePath, "exec", "app_process", "/system/bin", "com.github.uiautomator.MinitouchAgent"}, nil
-			// return []string{"/data/local/tmp/minitouch"}, nil
 		},
 		Shell: true,
 	})

minitouch.go

@@ -11,6 +11,8 @@ import (
 	"github.com/qiniu/log"
 )
 
+var minitouchSocketPath = "@minitouch"
+
 type toucher struct {
 	width, height int
 	rotation      int