hsun пре 3 година
родитељ
комит
7a4561b9f5
1 измењених фајлова са 16 додато и 12 уклоњено
  1. 16 12
      controller/activity/activity.go

+ 16 - 12
controller/activity/activity.go

@@ -191,16 +191,17 @@ func GetActivityShareImg(c *gin.Context)  {
 	activityEnd := activityInfo.EndTime.Format("15:04")
 	activityWeek := activityInfo.StartTime.Weekday().String()
 	var WeekDayMap = map[string]string{
-		"Monday":    "一",
-		"Tuesday":   "二",
-		"Wednesday": "三",
-		"Thursday":  "四",
-		"Friday":    "五",
-		"Saturday":  "六",
-		"Sunday":    "日",
+		"Monday":    "星期一",
+		"Tuesday":   "星期二",
+		"Wednesday": "星期三",
+		"Thursday":  "星期四",
+		"Friday":    "星期五",
+		"Saturday":  "星期六",
+		"Sunday":    "星期日",
 	}
 	weekStr := WeekDayMap[activityWeek]
-	timeStr := activityDate + " " + activityStart + "-" + activityEnd + " " + weekStr
+	dateStr := "活动时间:" + activityDate
+	timeStr := activityStart + "-" + activityEnd + " " + weekStr
 
 	// 获取原分享图
 	originShareUrl := "static/img/report_share.png"
@@ -221,7 +222,7 @@ func GetActivityShareImg(c *gin.Context)  {
 
 	// 处理文字x轴y轴点
 	drawText := activityInfo.ActivityTypeName
-	fontSize := 40
+	fontSize := 30
 	fontWidth := 50
 	x, y, newSize, err := calcuDrawXandY(drawText, fontSize, 500, 400)
 	if err != nil {
@@ -232,12 +233,15 @@ func GetActivityShareImg(c *gin.Context)  {
 	// 生成新分享图
 	var drawInfo []*utils.DrawTextInfo
 	text := &utils.DrawTextInfo{
-		Text: drawText, X: x, Y: y - 20, FontSize: fontSize,
+		Text: drawText, X: x, Y: y - 50, FontSize: fontSize,
+	}
+	textDate := &utils.DrawTextInfo{
+		Text: dateStr, X: 80, Y: y, FontSize: 30,
 	}
 	textTime := &utils.DrawTextInfo{
-		Text: timeStr, X: 35, Y: y + 30, FontSize: 30,
+		Text: timeStr, X: 105, Y: y + 50, FontSize: 30,
 	}
-	drawInfo = append(drawInfo, text, textTime)
+	drawInfo = append(drawInfo, text, textDate, textTime)
 	var colorRGBA = utils.FontRGBA{
 		R: 255, G: 255, B: 255, A: 255,
 	}