fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
laodaming 2023-08-31 12:19:02 +08:00
parent 7030846e37
commit 474cc4ddb7
1 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
server/websocket/internal/logic/ws_render_image.go
View File

@ -485,69 +485,72 @@ func (w *wsConnectItem) operationRenderTask() {
case data := <-w.extendRenderProperty.renderImageTaskCtlChan: case data := <-w.extendRenderProperty.renderImageTaskCtlChan:
switch data.option { switch data.option {
case 0: //渲染结果回调，删除任务 case 0: //渲染结果回调，删除任务
//存在任务，则发送渲染结果给前端 taskData, ok := w.extendRenderProperty.renderImageTask[data.taskId]
if taskData, ok := w.extendRenderProperty.renderImageTask[data.taskId]; ok { if !ok {
CombineTakesTime := "0ms" continue
UnityRenderTakesTime := "0ms"
uploadCombineImageTakesTime := "0ms"
uploadUnityRenderImageTakesTime := "0ms"
//合图时间
if taskData.combineTakesTime > 0 {
CombineTakesTime = fmt.Sprintf("%dms", taskData.combineTakesTime)
}
//上传刀版图时间
if taskData.uploadCombineImageTakesTime > 0 {
uploadCombineImageTakesTime = fmt.Sprintf("%dms", taskData.uploadCombineImageTakesTime)
}
//unity渲染时间
if taskData.unityRenderBeginTime > 0 && taskData.unityRenderEndTime > 0 {
UnityRenderTakesTime = fmt.Sprintf("%dms", taskData.unityRenderEndTime-taskData.unityRenderBeginTime)
}
//上传unity渲染图耗时
if taskData.uploadUnityRenderImageTakesTime > 0 {
uploadUnityRenderImageTakesTime = fmt.Sprintf("%dms", taskData.uploadUnityRenderImageTakesTime)
}
//发送到出口
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{
RenderId: taskData.renderId,
Image: data.renderNotifyImageUrl,
RenderProcessTime: websocket_data.RenderProcessTime{
CombineTakesTime: CombineTakesTime,
UnityRenderTakesTime: UnityRenderTakesTime,
UploadCombineImageTakesTime: uploadCombineImageTakesTime,
UploadUnityRenderImageTakesTime: uploadUnityRenderImageTakesTime,
},
}))
} }
//存在任务，则发送渲染结果给前端
CombineTakesTime := "0ms"
UnityRenderTakesTime := "0ms"
uploadCombineImageTakesTime := "0ms"
uploadUnityRenderImageTakesTime := "0ms"
//合图时间
if taskData.combineTakesTime > 0 {
CombineTakesTime = fmt.Sprintf("%dms", taskData.combineTakesTime)
}
//上传刀版图时间
if taskData.uploadCombineImageTakesTime > 0 {
uploadCombineImageTakesTime = fmt.Sprintf("%dms", taskData.uploadCombineImageTakesTime)
}
//unity渲染时间
if taskData.unityRenderBeginTime > 0 && taskData.unityRenderEndTime > 0 {
UnityRenderTakesTime = fmt.Sprintf("%dms", taskData.unityRenderEndTime-taskData.unityRenderBeginTime)
}
//上传unity渲染图耗时
if taskData.uploadUnityRenderImageTakesTime > 0 {
uploadUnityRenderImageTakesTime = fmt.Sprintf("%dms", taskData.uploadUnityRenderImageTakesTime)
}
//发送到出口
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{
RenderId: taskData.renderId,
Image: data.renderNotifyImageUrl,
RenderProcessTime: websocket_data.RenderProcessTime{
CombineTakesTime: CombineTakesTime,
UnityRenderTakesTime: UnityRenderTakesTime,
UploadCombineImageTakesTime: uploadCombineImageTakesTime,
UploadUnityRenderImageTakesTime: uploadUnityRenderImageTakesTime,
},
}))
//删除任务 //删除任务
delete(w.extendRenderProperty.renderImageTask, data.taskId) delete(w.extendRenderProperty.renderImageTask, data.taskId)
case 1: //新增任务 case 1: //新增任务
w.extendRenderProperty.renderImageTask[data.taskId] = &renderTask{ w.extendRenderProperty.renderImageTask[data.taskId] = &renderTask{
renderId: data.renderId, renderId: data.renderId,
} }
case 2: //修改任务属性 case 2: //修改任务属性
if taskData, ok := w.extendRenderProperty.renderImageTask[data.taskId]; ok { taskData, ok := w.extendRenderProperty.renderImageTask[data.taskId]
//合图耗时 if !ok {
if data.taskProperty.combineTakesTime != 0 { continue
taskData.combineTakesTime = data.taskProperty.combineTakesTime }
} //合图耗时
//上传合图耗时 if data.taskProperty.combineTakesTime != 0 {
if data.taskProperty.uploadCombineImageTakesTime != 0 { taskData.combineTakesTime = data.taskProperty.combineTakesTime
taskData.uploadCombineImageTakesTime = data.taskProperty.uploadCombineImageTakesTime }
} //上传合图耗时
//上传渲染结果图耗时 if data.taskProperty.uploadCombineImageTakesTime != 0 {
if data.taskProperty.uploadUnityRenderImageTakesTime != 0 { taskData.uploadCombineImageTakesTime = data.taskProperty.uploadCombineImageTakesTime
taskData.uploadUnityRenderImageTakesTime = data.taskProperty.uploadUnityRenderImageTakesTime }
} //上传渲染结果图耗时
//发送unity时间 if data.taskProperty.uploadUnityRenderImageTakesTime != 0 {
if data.taskProperty.unityRenderBeginTime != 0 { taskData.uploadUnityRenderImageTakesTime = data.taskProperty.uploadUnityRenderImageTakesTime
taskData.unityRenderBeginTime = data.taskProperty.unityRenderBeginTime }
} //发送unity时间
//收到unity返回的时间 if data.taskProperty.unityRenderBeginTime != 0 {
if data.taskProperty.unityRenderEndTime != 0 { taskData.unityRenderBeginTime = data.taskProperty.unityRenderBeginTime
taskData.unityRenderEndTime = data.taskProperty.unityRenderEndTime }
} //收到unity返回的时间
if data.taskProperty.unityRenderEndTime != 0 {
taskData.unityRenderEndTime = data.taskProperty.unityRenderEndTime
} }
} }
} }