Bläddra i källkod

参考聚宝旧版代码,移植、新增工作语音播报

niujiuru 2 veckor sedan
förälder
incheckning
229407aff2

+ 12 - 0
mcu_ctrl_board/upgrade_hmi.go

@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 	"hnyfkj.com.cn/rtu/linux/utils/jsonrpc2"
 )
 
@@ -28,6 +30,9 @@ func StartHMIUpgrade(filePath string, onSuccess func(any), callbackArg any) erro
 			Board.upgradeMu.Unlock()
 		}()
 
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+			"startupdate.wav")) ///// 播报开始升级语音
+
 		startTime := time.Now()
 		baseapp.Logger.Warnf("====[ HMI UPGRADE PREPARE ]==== [%s]", MODULE_NAME)
 		baseapp.Logger.Warnf("##########################################################")
@@ -35,15 +40,22 @@ func StartHMIUpgrade(filePath string, onSuccess func(any), callbackArg any) erro
 		baseapp.Logger.Warnf("##########################################################")
 
 		if err := startHMIUpgrade(filePath); err != nil {
+			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+				"updatefailed.wav")) // 播报升级失败语音
 			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
 			return
 		}
 
 		if err := sendFilePackets(filePath); err != nil {
+			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+				"updatefailed.wav")) // 播报升级失败语音
 			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
 			return
 		}
 
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+			"updatesuccess.wav")) /// 播报升级成功语音
+
 		elapsed := time.Since(startTime)
 		baseapp.Logger.Warnf("====[ HMI UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
 

+ 8 - 0
mcu_ctrl_board/upgrade_mcu.go

@@ -3,9 +3,11 @@ package mcu_ctrl_board
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 	"hnyfkj.com.cn/rtu/linux/ymodem"
 )
 
@@ -39,6 +41,8 @@ func StartMCUUpgrade(filePath string) error {
 	mcuCtrlBoard_ComExit() /////////////// 1-关闭与控制板的串口通信
 	time.Sleep(100 * time.Millisecond)
 
+	utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+		"startupdate.wav")) ////// 播报开始升级语音
 	baseapp.Logger.Warnf("##########################################################")
 	baseapp.Logger.Warnf("#############   MCU FIRMWARE UPGRADE START   #############")
 	baseapp.Logger.Warnf("##########################################################")
@@ -46,8 +50,12 @@ func StartMCUUpgrade(filePath string) error {
 
 	size := ymodem.Send_file(filePath) /// 2-使用ymodem发送升级文件
 	if size <= 0 || size != int(fileSize) {
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+			"updatefailed.wav")) /// 播报升级失败语音
 		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", size, fileSize)
 	} else {
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+			"updatesuccess.wav")) // 播报升级成功语音
 		baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", time.Since(startTime)) ////////// 成功
 	}
 

+ 4 - 1
mqtt_reporter/data.go

@@ -20,7 +20,7 @@ func (r *MQTTReporter) startDataWorker() {
 		for { //////////////// 循环的处理控制板发来的数据上发请求 ////
 			select {
 			case data := <-mcu.Board.DataToMqttCh:
-				go r.forwardDataToMqttServers(data) // 并发处理上发 ////
+				r.forwardDataToMqttServers(data)
 			case <-r.ctx.Done():
 				return
 			} // end select
@@ -29,6 +29,9 @@ func (r *MQTTReporter) startDataWorker() {
 }
 
 func (r *MQTTReporter) forwardDataToMqttServers(data []byte) {
+	utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+		"dataupload.wav")) // 播报数据上传语音
+
 	logData := utils.FormatCompactJSON(data)
 	for _, server := range r.config.GetMQTTServers() {
 		if r.ctx.Err() != nil {

+ 10 - 0
mqtt_reporter/photo.go

@@ -35,6 +35,9 @@ func (r *MQTTReporter) startImagWorker() {
 func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
 	r.pruneHistoryPhotos(baseapp.IMG_DIR, photoMaxNums) // 这里先清理历史补录照片, 避免磁盘空间不足
 
+	utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+		"takephoto.wav")) // 播报拍照开始语音
+
 	baseapp.Logger.Infof("[%s] 拍照中, 请稍后...", MODULE_NAME)
 
 	s := time.Now()
@@ -49,6 +52,9 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
 	d := time.Since(s).Milliseconds()
 	baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %s, 耗时: %d毫秒", MODULE_NAME, imgFile, d)
 
+	utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+		"takephotodone.wav")) // 播报拍照完成语音
+
 	r.uploadPhotoToImagServers(imgFile, false)
 
 	return true
@@ -99,6 +105,8 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string, isBackfill /* 
 		}
 
 		if err != nil {
+			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+				"photouploadfailed.wav")) /////////////////////////////////////////////////////// 图片 上传失败 语音
 			baseapp.Logger.Errorf("[%s] %s %s -> %s 失败: %v!!", MODULE_NAME, action, imgFile, server.Name, err)
 			if server.ImagBackfill && !isBackfill {
 				needImagBackfill = true
@@ -106,6 +114,8 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string, isBackfill /* 
 			continue
 		}
 
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices", "pus.wav")) ////////// 图片 上传成功 语音
+
 		d := time.Since(s).Milliseconds()
 		baseapp.Logger.Infof("[%s] %s %s -> %s 成功, 耗时: %dms", MODULE_NAME, action, imgFile, server.Name, d)
 	}

+ 11 - 3
mqtt_reporter/yfkj_handler.go

@@ -103,7 +103,7 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 			return nil
 		}
 		filePath := filepath.Join(baseapp.VAR_DIR, "MCUUpgrade.rbl")
-		err := utils.DownloadFile(url, filePath)
+		err := utils.DownloadUpgradeFile(url, filePath)
 		if err != nil {
 			return err
 		}
@@ -122,7 +122,7 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 			return nil
 		}
 		filePath := filepath.Join(baseapp.VAR_DIR, "HMIUpgrade.zip")
-		err := utils.DownloadFile(url, filePath)
+		err := utils.DownloadUpgradeFile(url, filePath)
 		if err != nil {
 			return err
 		}
@@ -147,16 +147,24 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 			return nil
 		}
 		filePath := filepath.Join(baseapp.VAR_DIR, "RTUUpgrade.tgz")
-		err := utils.DownloadFile(url, filePath)
+		err := utils.DownloadUpgradeFile(url, filePath)
 		if err != nil {
 			return err
 		}
 
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+			"startupdate.wav")) ///// 播报开始升级语音
+
 		cmd := "tar xzf " + filePath + " -C " + baseapp.EXEC_DIR
 		if err := utils.ExecShell(cmd); err != nil {
+			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+				"updatefailed.wav")) // 播报升级失败语音
 			return err
 		}
 
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+			"updatesuccess.wav")) /// 播报升级成功语音
+
 		data, _ := json.Marshal(map[string]string{"result": "rtu upgrade success"})
 		yfkj_sendResponse(client, string(data))
 	default:

+ 10 - 0
utils/utils.go

@@ -263,3 +263,13 @@ func DownloadFile(url, dst string) error {
 		return fmt.Errorf("不支持的下载协议: %s", info.Scheme)
 	}
 }
+
+func DownloadUpgradeFile(url, dst string) error {
+	err := DownloadFile(url, dst)
+	audioFile := "fdsuccess.wav" // 下载成功语音
+	if err != nil {
+		audioFile = "fdfailed.wav" // 下载失败语音
+	}
+	PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices", audioFile))
+	return err
+}