|
@@ -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
|
|
|
}
|