diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index a2dc57352..efe4a599c 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -479,23 +479,23 @@ func replaceContent(content string, printMsg *model.PrintMsg) (result string) {
if strings.Contains(result, byteSignSound) && strings.Contains(result, byteSignSoundE) {
if sounds := regexpSound.FindStringSubmatch(result); len(sounds) > 0 {
sound := sounds[1]
- printer := model.Printer{}
- printer.Volume = 4
- printer.Sound = "sounda"
+ //printer := model.Printer{}
+ //printer.Volume = 4
+ //printer.Sound = "sounda"
//if printer, _ := dao.GetPrinter(dao.GetDB(), printMsg.PrintNo); printer != nil {
//先把结束标签消了
result = strings.ReplaceAll(result, byteSignSoundE, "")
//fd 固定
//001a (声音数据长度高八位低八位)
//0101 固定
- soundPrefix := ""
- if printer.Sound != "" {
- soundPrefix = "[v" + utils.Int2Str(printer.Volume*2) + "]" + printer.Sound
- } else {
- soundPrefix = "[v" + utils.Int2Str(printer.Volume*2) + "]"
- }
- hexPrefix, _ := jxutils.Utf8ToGbk([]byte(soundPrefix))
- hexPrefixStr := hex.EncodeToString(hexPrefix)
+ //soundPrefix := ""
+ //if printer.Sound != "" {
+ // soundPrefix = "[v" + utils.Int2Str(printer.Volume*2) + "]" + printer.Sound
+ //} else {
+ // soundPrefix = "[v" + utils.Int2Str(printer.Volume*2) + "]"
+ //}
+ //hexPrefix, _ := jxutils.Utf8ToGbk([]byte(soundPrefix))
+ //hexPrefixStr := hex.EncodeToString(hexPrefix)
// 将语音包转换为十六进制
voice := ""
@@ -509,16 +509,16 @@ func replaceContent(content string, printMsg *model.PrintMsg) (result string) {
voiceData := hex.EncodeToString(voiceDataGBK)
//[8]sounda14 ->5b385d736f756e64613134
- realSound := hexPrefixStr + voiceData
- allLen := fmt.Sprintf("%x", (len("fd001a0101")+len(realSound))/2)
+ //realSound := hexPrefixStr + voiceData
+ realSound := voiceData
+ allLen := fmt.Sprintf("%x", (len(realSound))/2)
if len(allLen) < 2 {
allLen = "0" + allLen
}
//soundLenH, soundLenX := int2h8l8(int64((len(realSound) + len("0101")) / 2))
//result = strings.ReplaceAll(result, byteSignSound, hexSignSound+allLen+"fd"+soundLenH+soundLenX+"0100"+hexPrefixStr)
- result = strings.ReplaceAll(result, byteSignSound, hexSignSoundOld+hexPrefixStr)
- result = strings.ReplaceAll(result, byteSignSoundE, "")
+ result = strings.ReplaceAll(result, byteSignSound, hexSignSoundOld+realSound)
//}
}
}
diff --git a/business/jxstore/event/print_test.go b/business/jxstore/event/print_test.go
index 9c35f1f55..51a223899 100644
--- a/business/jxstore/event/print_test.go
+++ b/business/jxstore/event/print_test.go
@@ -13,7 +13,7 @@ func TestPrintMsg(t *testing.T) {
msg := &model.PrintMsg{
ModelIDCULD: model.ModelIDCULD{},
PrintNo: "20220707000002",
- Content: "\t20\t\t京西果园
\t\t手机买菜上京西
极速到家送惊喜
--------------------------------
下单时间: 2021-08-27 21:57:26
预计送达: 2021-08-27 22:57:26
订单编号: 93154441730211100
美团外卖#19
93154441730211100
客户: 李大梦(先生)
电话: 15987200340
地址: 北浦伟业广场-2号楼 (伟业广场B区)@#云南省楚雄彝族自治州楚雄市鹿城镇伟业广场
客户备注:
【如遇缺货】： 缺货时电话与我沟通
商品明细:
品名 数量 单价 小计
--------------------------------
【自由拼】洗净红提160g/盒
x1 ￥9.20 ￥9.20
【果切】 牛奶木瓜约300g/份
x1 ￥9.70 ￥9.70
【自由拼】严选香蕉果切180g/盒
x1 ￥8.80 ￥8.80
[网红果切]乌梅小番茄25g/个
x10 ￥0.80 ￥8.00
[现剥]甜石榴籽约250g/份(1个)
x1 ￥3.50 ￥3.50
【爆品特惠】新鲜脆甜半斤哈密瓜 哈蜜瓜果切一盒250g/盒(230~260g)
x1 ￥0.01 ￥0.01
【爆品特惠】新鲜脆甜半斤哈密瓜 哈蜜瓜果切一盒250g/盒(230~260g)
x1 ￥8.60 ￥8.60
共7种16件商品
--------------------------------
商品质量问题请联系:
京西果园·果切·水果捞（果果屋店）:15841011397
更多信息请关注官方微信: 京西菜市
--------------------------------
--------------------------------
\n",
+ Content: "20",
OrderNo: 2022071109,
Status: 0,
Comment: "",