diff --git a/service/beatleader/model.go b/service/beatleader/model.go index d294731..48abf82 100644 --- a/service/beatleader/model.go +++ b/service/beatleader/model.go @@ -514,20 +514,6 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string { baseboard := sprite.NewNamedSpriteBoard() - avatar, err := util.ResizeImageByMaxHeight2Image(filePath, 214) - if err != nil { - log.Default().Printf("缩放头像失败,url:%s,err:%v", p.Avatar, err) - } - avatarSpirit := sprite.Sprite{ - Name: "avatar", - Image: avatar, - Index: 1, - } - if avatar == nil { - avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0)) - } - baseboard.AddSprite(&avatarSpirit) - var sb strings.Builder sb.WriteString(fmt.Sprintf("玩家 %s\n", p.Name)) sb.WriteString(fmt.Sprintf("区域 %s\n", p.Country)) @@ -584,6 +570,21 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string { if err != nil { log.Default().Printf("渲染文字失败,err:%v", err) } + + avatar, err := util.ResizeImageByMaxHeight2Image(filePath, uint(textImg.Bounds().Dy())) + if err != nil { + log.Default().Printf("缩放头像失败,url:%s,err:%v", p.Avatar, err) + } + avatarSpirit := sprite.Sprite{ + Name: "avatar", + Image: avatar, + Index: 1, + } + if avatar == nil { + avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0)) + } + baseboard.AddSprite(&avatarSpirit) + textSpirit := sprite.Sprite{ Name: "text", Image: textImg, diff --git a/service/scoresaber/model.go b/service/scoresaber/model.go index 40e25f7..2742e44 100644 --- a/service/scoresaber/model.go +++ b/service/scoresaber/model.go @@ -333,20 +333,6 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string { baseboard := sprite.NewNamedSpriteBoard() - avatar, err := util.ResizeImageByMaxHeight2Image(filePath, 214) - if err != nil { - log.Default().Printf("缩放头像失败,url:%s,err:%v", p.ProfilePicture, err) - } - avatarSpirit := sprite.Sprite{ - Name: "avatar", - Image: avatar, - Index: 1, - } - if avatar == nil { - avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0)) - } - baseboard.AddSprite(&avatarSpirit) - var sb strings.Builder sb.WriteString(fmt.Sprintf("玩家 %s\n", p.Name)) sb.WriteString(fmt.Sprintf("区域 %s\n", p.Country)) @@ -403,6 +389,21 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string { if err != nil { log.Default().Printf("渲染文字失败,err:%v", err) } + + avatar, err := util.ResizeImageByMaxHeight2Image(filePath, uint(textImg.Bounds().Dy())) + if err != nil { + log.Default().Printf("缩放头像失败,url:%s,err:%v", p.ProfilePicture, err) + } + avatarSpirit := sprite.Sprite{ + Name: "avatar", + Image: avatar, + Index: 1, + } + if avatar == nil { + avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0)) + } + baseboard.AddSprite(&avatarSpirit) + textSpirit := sprite.Sprite{ Name: "text", Image: textImg,