Browse Source

新增播报提示语音

niujiuru 1 month ago
parent
commit
9c26d0edc0

+ 14 - 4
main.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"net"
 	"net/http"
 	"os"
 	"time"
@@ -16,6 +17,7 @@ import (
 	"hnyfkj.com.cn/rtu/linux/utils/jsonrpc2"
 
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 )
 
 var (
@@ -97,12 +99,20 @@ func (p *program) run() {
 		p.http_server.Addr,
 	)
 
-	err := p.http_server.ListenAndServe() // 同步阻塞
-
-	if err != nil && !errors.Is(err, http.ErrServerClosed) {
-		baseapp.Logger.Errorf("[%s] Start http server error: %v!!", p.name, err)
+	ln, err := net.Listen(network, listenAddr)
+	if err != nil {
+		baseapp.Logger.Errorf("[%s] Http listen failed: %v", p.name, err)
 		return
 	}
+
+	baseapp.Logger.Infof("[%s] Http server started", p.name)
+
+	utils.PlayAudioAsync("voices/welcome.wav") //播放开机语音
+
+	if err := p.http_server.Serve(ln); err != nil &&
+		!errors.Is(err, http.ErrServerClosed) {
+		baseapp.Logger.Errorf("[%s] Http server error: %v", p.name, err)
+	}
 }
 
 // Stop should not block. Return with a few seconds.

+ 1 - 0
mcu_ctrl_board/mcu_ctrl_board.go

@@ -39,6 +39,7 @@ func ModuleInit() bool {
 		}
 		ret, err = mcuCtrlBoard_ComInit()
 		if ret == -1 {
+			mcuCtrlBoard_ComExit()
 			time.Sleep(1 * time.Second)
 			continue
 		} else {

+ 13 - 13
utils/utils.go

@@ -6,6 +6,8 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+
+	"hnyfkj.com.cn/rtu/linux/baseapp"
 )
 
 func ExecShell(cmd string) error {
@@ -18,19 +20,17 @@ func ExecShell(cmd string) error {
 	return nil
 }
 
-func PlayAudio(filePath string) error {
-	if _, err := os.Stat(filePath); err != nil {
-		return fmt.Errorf("音频文件不存在: %s", filePath)
-	}
-
-	cmd := exec.Command("aplay", filePath)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("播放音频失败: %v", err)
-	}
-
-	return nil
+func PlayAudioAsync(filePath string) {
+	go func() {
+		if _, err := os.Stat(filePath); err != nil {
+			baseapp.Logger.Errorf("播放音频失败: %v", err)
+			return
+		}
+
+		if err := exec.Command("aplay", filePath).Run(); err != nil {
+			baseapp.Logger.Errorf("播放音频失败: %v", err)
+		}
+	}()
 }
 
 func GetCPUTemperature() (float64, error) {

BIN
voices/8858.wav


BIN
voices/autotakephoto.wav


BIN
voices/button.wav


BIN
voices/dataupload.wav


BIN
voices/drop.wav


BIN
voices/fdfailed.wav


BIN
voices/fdsuccess.wav


BIN
voices/kuaimen.wav


BIN
voices/netfailed.wav


BIN
voices/netisok.wav


BIN
voices/photouploadfailed.wav


BIN
voices/pus.wav


BIN
voices/pwron.wav


+ 21 - 0
voices/readme.md

@@ -0,0 +1,21 @@
+# 使用说明:
+- stm32串口发送文件名字符串:
+- eg:  save.mp3
+- A7/724解析对应字符串来播放对应文件/直接播放对应文件.
+
+## 文件名		描述
+- button.wav		屏幕按键提示音
+- dataupload.wav		数据上传中
+- fdfailed.wav		升级文件下载失败
+- fdsuccess.wav		升级文件下载成功
+- netfailed.wav		网络连接失败
+- netisok.wav		网络连接成功
+- photouploadfailed.wav	图片上传失败
+- save.wav			设置已保存
+- simfailed.wav		未检测到SIM卡
+- startupdate.wav		开始升级(ymodem连接成功,串口收到第一个C)
+- takephoto.wav		拍照中
+- updatefailed.wav		升级失败(if(ymodem升级函数返回成功)else(失败))
+- updatesuccess.wav		升级成功(if(ymodem升级函数返回成功)else(失败))
+- workdone.wav		测报任务结束
+- workstart.wav		测报任务开始

BIN
voices/reset.wav


BIN
voices/save.wav


BIN
voices/simfailed.wav


BIN
voices/startupdate.wav


BIN
voices/storage.wav


BIN
voices/takephoto.wav


BIN
voices/takephotodone.wav


BIN
voices/tfcardchecked.wav


BIN
voices/turn.wav


BIN
voices/updatefailed.wav


BIN
voices/updatesuccess.wav


BIN
voices/usbmounted.wav


BIN
voices/welcome.wav


BIN
voices/workdone.wav


BIN
voices/workstart.wav