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

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-08-29 16:26:30 +08:00
commit b118357d54
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,10 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{ w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
RenderId: renderImageData.RenderId, RenderId: renderImageData.RenderId,
CombineImage: combineImage, CombineImage: combineImage,
CombineProcessTime: websocket_data.CombineProcessTime{
CombineTakesTime: fmt.Sprintf("%dms", res.DiffTimeLogoCombine),
UploadCombineImageTakesTime: fmt.Sprintf("%dms", res.DiffTimeUploadFile),
},
})) }))
//如果是传入了指定尺寸，则不走unity //如果是传入了指定尺寸，则不走unity
if renderImageData.RenderData.SizeId > 0 { if renderImageData.RenderData.SizeId > 0 {

9
utils/websocket_data/render_data.go
View File

@ -41,6 +41,11 @@ type RenderProcessTime struct {
// 合图返回数据 // 合图返回数据
type CombineImageRspMsg struct { type CombineImageRspMsg struct {
RenderId string `json:"render_id"` //渲染id RenderId string `json:"render_id"` //渲染id
CombineImage string `json:"combine_image"` //刀版图 CombineImage string `json:"combine_image"` //刀版图
CombineProcessTime CombineProcessTime `json:"combine_process_time"`
}
type CombineProcessTime struct {
CombineTakesTime string `json:"combine_takes_time"` //合图时间
UploadCombineImageTakesTime string `json:"upload_combine_image_takes_time"` //上传刀版图耗时
} }