前三个点位所有功能已调通

internal/middleware/bgm.go

@@ -4,6 +4,7 @@ import (
 	"game-driver/internal/schema"
 	"game-driver/leaf"
 	"game-driver/pkg/audio"
+	"game-driver/pkg/utils"
 	"github.com/gopxl/beep/v2/speaker"
 	"log"
 	"sync"
@@ -13,7 +14,7 @@ func PlayBgm() leaf.HandlerFunc {
 	return func(c *leaf.Context) {
 		pm := leaf.Value[*schema.PlayModal](c, PayloadJSONKey)
 
-		bgm := audio.LinkAudio(pm.BGM)
+		bgm := utils.LinkAudio(pm.BGM)
 		if bgm != nil {
 			// 等待组
 			var wait sync.WaitGroup

internal/middleware/log.go

@@ -0,0 +1,15 @@
+package middleware
+
+import (
+	"game-driver/leaf"
+	"log"
+)
+
+func RunLog() leaf.HandlerFunc {
+	return func(c *leaf.Context) {
+		log.Printf("收到消息, topic: %s, payload: %s", c.Topic, c.Payload)
+		defer log.Println("执行结束")
+
+		c.Next()
+	}
+}

internal/routes/play.go

@@ -0,0 +1,24 @@
+package routes
+
+import (
+	"game-driver/internal/routes/play"
+	"game-driver/leaf"
+)
+
+func PlayRouter(location string, point int) leaf.HandlerFunc {
+	switch location {
+	case "wushan":
+		return switchPoint(point)
+	default:
+		return play.Default
+	}
+}
+
+func switchPoint(point int) leaf.HandlerFunc {
+	switch point {
+	case 3:
+		return play.OnlyVideo
+	default:
+		return play.Default
+	}
+}

internal/routes/play/default.go

@@ -0,0 +1,19 @@
+package play
+
+import (
+	"game-driver/internal/middleware"
+	"game-driver/internal/schema"
+	"game-driver/leaf"
+	"time"
+)
+
+func Default(c *leaf.Context) {
+	payload := leaf.Value[*schema.PlayModal](c, middleware.PayloadJSONKey)
+
+	if w, ok := payload.Game["wait"]; ok {
+		select {
+		case <-c.Done():
+		case <-time.After(time.Duration(w.(int)) * time.Second):
+		}
+	}
+}

internal/routes/play/only_video.go

@@ -0,0 +1,17 @@
+package play
+
+import (
+	"game-driver/internal/middleware"
+	"game-driver/internal/schema"
+	"game-driver/leaf"
+	"game-driver/pkg/utils"
+	"game-driver/pkg/video"
+)
+
+func OnlyVideo(c *leaf.Context) {
+	payload := leaf.Value[*schema.PlayModal](c, middleware.PayloadJSONKey)
+
+	if url, ok := payload.Game["video"]; ok {
+		_ = video.Play(c, utils.LinkVideo(url.(string)))
+	}
+}

internal/routes/wait.go

@@ -7,6 +7,8 @@ import (
 	"game-driver/pkg/audio"
 	"game-driver/pkg/relay"
 	"game-driver/pkg/tts"
+	"game-driver/pkg/utils"
+	"game-driver/pkg/video"
 	"github.com/gopxl/beep/v2/speaker"
 	"log"
 	"sync"
@@ -51,26 +53,32 @@ func WaitAction(c *leaf.Context) {
 			switch item.Type {
 			case schema.WaitAudio:
 				// 执行音乐播放
+				wait.Add(1)
 				go func() {
-					wait.Add(1)
 					defer wait.Done()
 					audioAction(c, item, payload.TimeModel)
 				}()
 			case schema.WaitTTS:
 				// 执行TTS播放
+				wait.Add(1)
 				go func() {
-					wait.Add(1)
 					defer wait.Done()
 					ttsAction(c, item, payload.TimeModel)
 				}()
 			case schema.WaitRelay:
 				// 执行继电器供电
+				wait.Add(1)
 				go func() {
-					wait.Add(1)
 					defer wait.Done()
 					relayAction(c, item, payload.TimeModel)
 				}()
 			case schema.WaitVideo:
+				// 执行视频播放
+				wait.Add(1)
+				go func() {
+					defer wait.Done()
+					videoAction(c, item, payload.TimeModel)
+				}()
 			case schema.WaitWeb:
 			default:
 				log.Printf("不支持的类型: %d\n", item.Type)
@@ -95,7 +103,7 @@ func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
 	case <-timerAction(item.Start):
 		{
 			log.Println("开始执行后台任务")
-			data := audio.LinkAudio(item.Data)
+			data := utils.LinkAudio(item.Data)
 
 			ctrl, closer := audio.PlayBgmMP3(data)
 			defer closer()
@@ -177,3 +185,33 @@ func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
 		}
 	}
 }
+
+func videoAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
+	if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
+		log.Println("开始时间小于根任务开始时间")
+		return
+	}
+
+	if item.End != 0 {
+		cancel := leaf.WithDeadline(c, time.Unix(item.End, 0))
+		defer cancel()
+	}
+
+	select {
+	case <-c.Done():
+	case <-timerAction(item.Start):
+		{
+			for {
+				err := video.Play(c, utils.LinkVideo(item.Data))
+				if err != nil {
+					log.Panicln("视频播放异常: ", err)
+				}
+				select {
+				case <-c.Done():
+					return
+				case <-time.After(time.Duration(item.Interval) * time.Second):
+				}
+			}
+		}
+	}
+}

internal/server.go

@@ -28,6 +28,7 @@ func buildMqtt(c config.MqttConfig, r *leaf.Engine, subTopics ...string) autopah
 
 	subscriptions := make([]paho.SubscribeOptions, 0)
 	for _, topic := range subTopics {
+		log.Println("订阅主题: ", topic)
 		subscriptions = append(subscriptions, paho.SubscribeOptions{Topic: topic, QoS: 0})
 	}
 
@@ -75,15 +76,13 @@ func Run() {
 	topicPrefix := fmt.Sprintf("server/%s/%v/", config.C.Location, config.C.Point)
 	publishTopic := fmt.Sprintf("device/%s/%v/status", config.C.Location, config.C.Point)
 
-	log.Println("topicPrefix: ", topicPrefix)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
 	router := leaf.Default(ctx)
 
 	router.DefaultHandler(func(c *leaf.Context) {
-		log.Println("接收到未处理消息: " + string(c.Payload))
+		log.Printf("未处理消息 topic: %s\n payload: %s\n", c.Topic, c.Payload)
 	})
 
 	// 构建 MQTT 连接
@@ -114,6 +113,7 @@ func Run() {
 
 	// 处理启动报文
 	router.RegisterHandler(topicPrefix+"play",
+		middleware.RunLog(),
 		middleware.PayloadJSON[schema.PlayModal](),
 		middleware.DeviceLock(device),
 		middleware.EmergencyStop(common.GlobalStopper),
@@ -122,22 +122,20 @@ func Run() {
 		middleware.TimeoutOver(config.C.Game.MaxTimeout),
 		middleware.TickerAction(),
 		middleware.PlayBgm(),
-		func(c *leaf.Context) {
-			log.Println("接收到启动消息: ", string(c.Payload))
-			select {
-			case <-c.Done():
-				log.Println("执行结束")
-			}
-		},
+		routes.PlayRouter(config.C.Location, config.C.Point),
 	)
 	// 处理待机线程报文
 	router.RegisterHandler(topicPrefix+"wait",
+		middleware.RunLog(),
 		middleware.PayloadJSON[schema.WaitModel](),
 		middleware.EmergencyStop(common.GlobalBgStopper),
 		routes.WaitAction,
 	)
 	// 处理指令
-	router.RegisterHandler(topicPrefix+"command", routes.Command(device))
+	router.RegisterHandler(topicPrefix+"command",
+		middleware.RunLog(),
+		routes.Command(device),
+	)
 
 	// 启动完成发送一次设备状态
 	device.PublishStatus()
@@ -150,8 +148,8 @@ func Run() {
 
 	ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	if err := cm.Disconnect(ctx); err != nil {
-		fmt.Printf("断开连接异常: %s\n", err)
+	if e := cm.Disconnect(ctx); e != nil {
+		fmt.Printf("断开连接异常: %s\n", e)
 	}
 
 	fmt.Println("关闭完成")