sun-pc 6 maanden geleden
bovenliggende
commit
5713f3ddb7
3 gewijzigde bestanden met toevoegingen van 27 en 4 verwijderingen
  1. 14 4
      src/client/router.go
  2. 4 0
      src/conf/zinx.json
  3. 9 0
      src/zinx.log

+ 14 - 4
src/client/router.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"encoding/json"
 	"fmt"
 	"os/exec"
 	"strings"
@@ -20,6 +21,11 @@ func (*OpenNativeRenderRouter) PreHandle(request ziface.IRequest) {
 	zlog.Ins().DebugF("recv from client : msgId=%d, data=%+v, len=%d", request.GetMsgID(), string(request.GetData()), len(request.GetData()))
 }
 
+type StartNativeRenderReq struct {
+	RoomId int    `json:"roomId"`
+	Url    string `json:"url"`
+}
+
 func (*OpenNativeRenderRouter) Handle(request ziface.IRequest) {
 	// 获取roomId
 	data := request.GetData()
@@ -28,11 +34,12 @@ func (*OpenNativeRenderRouter) Handle(request ziface.IRequest) {
 		zlog.Error("参数不正确")
 		return
 	}
-	roomId := params[0]
-	url := params[1]
+	nativeRenderReq := &StartNativeRenderReq{}
+	err := json.Unmarshal(data, &nativeRenderReq)
+	zlog.Error(err)
 
 	// !这里没有deviceId native render如何知道自己属于哪个设备?因为此时room中并没有nr.device
-	go openNativeRender(roomId, url, request.GetConnection())
+	go openNativeRender(fmt.Sprintf("%d", nativeRenderReq.RoomId), nativeRenderReq.Url, request.GetConnection())
 
 }
 
@@ -71,6 +78,9 @@ func openNativeRender(roomId, url string, conn ziface.IConnection) {
 				}
 			}
 
+		} else {
+			break
+
 		}
 
 		//判断是正常退出还是异常退出 0- 正常退出 != 0异常退出
@@ -96,5 +106,5 @@ func openRenderFile(cmdPath string, args []string) (int, error) {
 		return -1, err
 	}
 
-	return 0, nil
+	return -1, nil
 }

+ 4 - 0
src/conf/zinx.json

@@ -0,0 +1,4 @@
+{
+  "LogDir": "./",
+  "LogFile":"zinx.log"
+}

+ 9 - 0
src/zinx.log

@@ -0,0 +1,9 @@
+2024/09/24 15:31:10 [INFO]msghandler.go:244: Add Router msgID = 40
+2024/09/24 15:31:10 [INFO]client.go:171: [START] Zinx Client LocalAddr: 127.0.0.1:60462, RemoteAddr: 127.0.0.1:9000
+2024/09/24 15:31:10 [INFO]ws_connection.go:542: ZINX CallOnConnStart....
+2024/09/24 15:31:10 [INFO]ws_connection.go:206: [Reader Goroutine is running]
+2024/09/24 15:32:53 [DEBUG]ws_connection.go:233: read buffer 0000002800000055313a68747470733a2f2f736b7533642d746573742e6f62732e636e2d656173742d332e6d79687561776569636c6f75642e636f6d2f626c656e6465722f313732363832363230363136315f3531506a72642e747874 
+2024/09/24 15:32:53 [DEBUG]ws_connection.go:251: read buffer 0000002800000055313a68747470733a2f2f736b7533642d746573742e6f62732e636e2d656173742d332e6d79687561776569636c6f75642e636f6d2f626c656e6465722f313732363832363230363136315f3531506a72642e747874 
+2024/09/24 15:32:53 [DEBUG]router.go:20: recv from client : msgId=40, data=1:https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/blender/1726826206161_51Pjrd.txt, len=85
+2024/09/24 15:32:53 [ERROR]router.go:28: 参数不正确
+2024/09/24 15:45:29 [INFO]msghandler.go:244: Add Router msgID = 40