修复停止的信号

This commit is contained in:
2024-11-12 15:02:10 +08:00
parent cc12b60437
commit 9f40a7156e
5 changed files with 11 additions and 14 deletions

View File

@@ -32,7 +32,6 @@ func PlayBgm() leaf.HandlerFunc {
wait.Add(1) wait.Add(1)
go func() { go func() {
// 等待结束
defer wait.Done() defer wait.Done()
logger.Infoln("开始播放背景音乐") logger.Infoln("开始播放背景音乐")
@@ -41,7 +40,7 @@ func PlayBgm() leaf.HandlerFunc {
ctrl, closer, e := audio.PlayBgmMP3(bgm) ctrl, closer, e := audio.PlayBgmMP3(bgm)
defer closer() defer closer()
if e != nil { if e != nil {
logger.Errorln("播放背景音乐失败", e) logger.Errorln("播放背景音乐异常", e)
return return
} }

View File

@@ -17,14 +17,15 @@ func EmergencyStop(stopper common.Stopper) leaf.HandlerFunc {
// 发送结束信号 // 发送结束信号
defer close(a) defer close(a)
logger.Infoln("监听停止信号")
go func() { go func() {
defer logger.Infoln("结束停止信号监") defer logger.Infoln("结束停止信号监")
select { select {
case <-a: case <-a:
case <-stopper.Done(): case <-stopper.Done():
{ {
logger.Infoln("紧急停止信号触发") logger.Infoln("停止信号触发")
cancel() cancel()
leaf.WithValue[leaf.EndType](c, leaf.EndKey, leaf.EndStop) leaf.WithValue[leaf.EndType](c, leaf.EndKey, leaf.EndStop)
} }

View File

@@ -35,7 +35,6 @@ func TickerAction() leaf.HandlerFunc {
wait.Add(1) wait.Add(1)
go func() { go func() {
start := time.Now() start := time.Now()
// 等待结束
defer wait.Done() defer wait.Done()
// 定时器 // 定时器
ticker := time.NewTicker(time.Second) ticker := time.NewTicker(time.Second)

View File

@@ -34,7 +34,6 @@ func TimeoutOver(maxTimeout int) leaf.HandlerFunc {
cancel := leaf.WithCancel(c) cancel := leaf.WithCancel(c)
wait.Add(1) wait.Add(1)
go func() { go func() {
// 等待结束
defer wait.Done() defer wait.Done()
logger.Infoln("超时 Timer 监控开始") logger.Infoln("超时 Timer 监控开始")

View File

@@ -10,7 +10,6 @@ import (
"game-driver/internal/schema" "game-driver/internal/schema"
"game-driver/leaf" "game-driver/leaf"
"game-driver/pkg/logger" "game-driver/pkg/logger"
"game-driver/pkg/relay"
"game-driver/pkg/tts" "game-driver/pkg/tts"
"game-driver/pkg/utils" "game-driver/pkg/utils"
"github.com/eclipse/paho.golang/autopaho" "github.com/eclipse/paho.golang/autopaho"
@@ -106,13 +105,13 @@ func Run() {
tts.DefaultTTS = tts.New(ctx, config.C.Aliyun) tts.DefaultTTS = tts.New(ctx, config.C.Aliyun)
// 构建继电器对象 // 构建继电器对象
r, err := relay.New(config.C.Relay, func(msg string) { //r, err := relay.New(config.C.Relay, func(msg string) {
logger.Infoln("串口返回: ", msg) // logger.Infoln("串口返回: ", msg)
}) //})
if err != nil { //if err != nil {
logger.Panicln("串口连接异常: ", err) // logger.Panicln("串口连接异常: ", err)
} //}
defer r.Close() //defer r.Close()
// 构建全局设备变量 // 构建全局设备变量
device := common.DefaultDevice(ctx, cm, publishTopic) device := common.DefaultDevice(ctx, cm, publishTopic)