From 2d75a94b242dd1c01bc29e0bde734450d7efbfdd Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 4 Aug 2021 15:11:12 +0800
Subject: [PATCH] aa

---
 business/jxstore/event/event_tcp.go       |  8 ++++++
 business/jxstore/event/event_tcp_utils.go | 31 ++++++++++++-----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go
index 88dd48103..a37232617 100644
--- a/business/jxstore/event/event_tcp.go
+++ b/business/jxstore/event/event_tcp.go
@@ -11,6 +11,7 @@ import (
 	"net"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 //入口
@@ -245,6 +246,13 @@ func (t *TcpClient) doPrint(key string) (err error) {
 									dataStr := <-t.CallBackMap[printMsg.PrintNo]
 									a, b := getCallbackMsgInfo(dataStr)
 									t.changePrintMsg(dataStr, a, b)
+									//判断音频暂停？
+									//收到打印成功回调后，如果消息中有音频，需要等待一下
+									if sounds := regexpSoundSpan.FindStringSubmatch(printMsg.Content); len(sounds) > 0 {
+										sound := sounds[1]
+										lenTime := time.Duration(utf8.RuneCountInString(sound)) * time.Second
+										time.Sleep(lenTime)
+									}
 								}
 							}
 						}
diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index 4865255ba..231965a16 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -41,17 +41,17 @@ const (
 
 //标签
 const (
-	signBR       = "<br>"     //换行
-	signCenter   = "<center>" //居中
-	signLeft     = "<left>"   //居左
-	signRight    = "<right>"  //居右
-	signBig      = "<b>"      //字体放大
-	signHighBig  = "<hb>"     //字体纵向放大
-	signWideBig  = "<wb>"     //字体横向放大
-	signQrCenter = "<qrc>"    //二维码居中
-	signQrLeft   = "<qrl>"    //二维码居左
-	signQrRight  = "<qrr>"    //二维码居右
-	signSound    = "<sound>"  //声音
+	signBR                  = "<br>"     //换行
+	signCenter              = "<center>" //居中
+	signLeft                = "<left>"   //居左
+	signRight               = "<right>"  //居右
+	signBig                 = "<b>"      //字体放大
+	signHighBig             = "<hb>"     //字体纵向放大
+	signWideBig             = "<wb>"     //字体横向放大
+	signQrCenter            = "<qrc>"    //二维码居中
+	signQrLeft              = "<qrl>"    //二维码居左
+	signQrRight             = "<qrr>"    //二维码居右
+	signSound, signSoundEnd = "<sound>", "</sound>"
 
 	hexSignBROrEXE  = "0a"
 	hexSignCenter   = "1b6101"
@@ -103,10 +103,11 @@ var (
 		byteSignBR: hexSignBROrEXE,
 	}
 
-	regexpQrc   = regexp.MustCompile(byteSignQrCenter + "(.*?)" + byteSignQrCenterE)
-	regexpQrl   = regexp.MustCompile(byteSignQrLeft + "(.*?)" + byteSignQrLeftE)
-	regexpQrr   = regexp.MustCompile(byteSignQrRight + "(.*?)" + byteSignQrRightE)
-	regexpSound = regexp.MustCompile(byteSignSound + "(.*?)" + byteSignSoundE)
+	regexpQrc       = regexp.MustCompile(byteSignQrCenter + "(.*?)" + byteSignQrCenterE)
+	regexpQrl       = regexp.MustCompile(byteSignQrLeft + "(.*?)" + byteSignQrLeftE)
+	regexpQrr       = regexp.MustCompile(byteSignQrRight + "(.*?)" + byteSignQrRightE)
+	regexpSound     = regexp.MustCompile(byteSignSound + "(.*?)" + byteSignSoundE)
+	regexpSoundSpan = regexp.MustCompile(signSound + "(.*?)" + signSoundEnd)
 )
 
 type PrintInfo struct {