From 9f40a7156ec68cbbeaccfb5d5e57c4f8eee13e9e Mon Sep 17 00:00:00 2001
From: mapleafgo <mapleafgo@163.com>
Date: Tue, 12 Nov 2024 15:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=81=9C=E6=AD=A2=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/middleware/bgm.go    |  3 +--
 internal/middleware/stop.go   |  5 +++--
 internal/middleware/ticker.go |  1 -
 internal/middleware/timer.go  |  1 -
 internal/server.go            | 15 +++++++--------
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/internal/middleware/bgm.go b/internal/middleware/bgm.go
index 4d4a049..3947904 100644
--- a/internal/middleware/bgm.go
+++ b/internal/middleware/bgm.go
@@ -32,7 +32,6 @@ func PlayBgm() leaf.HandlerFunc {
 
 			wait.Add(1)
 			go func() {
-				// 等待结束
 				defer wait.Done()
 
 				logger.Infoln("开始播放背景音乐")
@@ -41,7 +40,7 @@ func PlayBgm() leaf.HandlerFunc {
 				ctrl, closer, e := audio.PlayBgmMP3(bgm)
 				defer closer()
 				if e != nil {
-					logger.Errorln("播放背景音乐失败", e)
+					logger.Errorln("播放背景音乐异常", e)
 					return
 				}
 
diff --git a/internal/middleware/stop.go b/internal/middleware/stop.go
index eec5995..f9b1198 100644
--- a/internal/middleware/stop.go
+++ b/internal/middleware/stop.go
@@ -17,14 +17,15 @@ func EmergencyStop(stopper common.Stopper) leaf.HandlerFunc {
 		// 发送结束信号
 		defer close(a)
 
+		logger.Infoln("监听停止信号")
 		go func() {
-			defer logger.Infoln("结束停止信号监控")
+			defer logger.Infoln("结束停止信号监听")
 
 			select {
 			case <-a:
 			case <-stopper.Done():
 				{
-					logger.Infoln("紧急停止信号触发")
+					logger.Infoln("停止信号触发")
 					cancel()
 					leaf.WithValue[leaf.EndType](c, leaf.EndKey, leaf.EndStop)
 				}
diff --git a/internal/middleware/ticker.go b/internal/middleware/ticker.go
index e69caad..aca8b87 100644
--- a/internal/middleware/ticker.go
+++ b/internal/middleware/ticker.go
@@ -35,7 +35,6 @@ func TickerAction() leaf.HandlerFunc {
 		wait.Add(1)
 		go func() {
 			start := time.Now()
-			// 等待结束
 			defer wait.Done()
 			// 定时器
 			ticker := time.NewTicker(time.Second)
diff --git a/internal/middleware/timer.go b/internal/middleware/timer.go
index 98ce1ff..5360cd9 100644
--- a/internal/middleware/timer.go
+++ b/internal/middleware/timer.go
@@ -34,7 +34,6 @@ func TimeoutOver(maxTimeout int) leaf.HandlerFunc {
 		cancel := leaf.WithCancel(c)
 		wait.Add(1)
 		go func() {
-			// 等待结束
 			defer wait.Done()
 
 			logger.Infoln("超时 Timer 监控开始")
diff --git a/internal/server.go b/internal/server.go
index 3894925..dd86a79 100644
--- a/internal/server.go
+++ b/internal/server.go
@@ -10,7 +10,6 @@ import (
 	"game-driver/internal/schema"
 	"game-driver/leaf"
 	"game-driver/pkg/logger"
-	"game-driver/pkg/relay"
 	"game-driver/pkg/tts"
 	"game-driver/pkg/utils"
 	"github.com/eclipse/paho.golang/autopaho"
@@ -106,13 +105,13 @@ func Run() {
 	tts.DefaultTTS = tts.New(ctx, config.C.Aliyun)
 
 	// 构建继电器对象
-	r, err := relay.New(config.C.Relay, func(msg string) {
-		logger.Infoln("串口返回: ", msg)
-	})
-	if err != nil {
-		logger.Panicln("串口连接异常: ", err)
-	}
-	defer r.Close()
+	//r, err := relay.New(config.C.Relay, func(msg string) {
+	//	logger.Infoln("串口返回: ", msg)
+	//})
+	//if err != nil {
+	//	logger.Panicln("串口连接异常: ", err)
+	//}
+	//defer r.Close()
 
 	// 构建全局设备变量
 	device := common.DefaultDevice(ctx, cm, publishTopic)