From 10653b50c55293c4246552204d05e7cabaff8ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 28 Jul 2022 14:32:19 +0800
Subject: [PATCH] 1

---
 business/jxstore/event/event_tcp_utils.go | 47 ++++++++++++-----------
 business/jxstore/event/print_test.go      |  2 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index 3bd5b10e2..14998e439 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -71,7 +71,7 @@ const (
 	hexSignQr                  = "1b5a000106" // "1b5a000106"  0600 : 后面二维码的字节数
 	hexSignQrEnd               = "000a1b40"   // 000a0a0a1b40
 	hexSignSound               = "1d6b40"     // 音频指令(自定义语音指令)
-	hexSignSoundSolidification = "1B59415501" // 音频指令(固化指令)
+	hexSignSoundSolidification = "1B594155"   // 音频指令(固化指令)
 
 	//起始标签 -- 自定义标签utf8转码为gbk字符集
 	byteSignBR       = "3c62723e"         // 换行
@@ -360,28 +360,29 @@ func changePrinterStatus(printNo string, status int) {
 
 //按打印机方提供的文档来的
 func buildMsg(printMsg *model.PrintMsg) (data []byte, err error) {
-	var (
-		content   = printMsg.Content
-		orderNo   = printMsg.OrderNo
-		str       = "1e"
-		const1    = "0200ff50"
-		printInit = "1b40" //打印机初始化
-		//voice     = "1d6b401dfd001a01015b7631365d736f756e64622cc4fad3d0d0c2b6a9b5a5c0b1" //语音，中国
-		//qr                                  = "1d58021b5a0001061600747470733a2f2f7777772e62616964752e636f6d2f1b000A0A0A1B40"
-		orderNoHexH, orderNoHexL, printData string
-	)
-	//写入数据
-	orderNoHexH, orderNoHexL = int2h8l8(int64(orderNo))
-
-	// 将数据与模板组装
-	printDataGBK, _ := jxutils.Utf8ToGbk([]byte(replaceContentOther(content)))
-	printData = hex.EncodeToString(printDataGBK)
-	printData = replaceContent(printData, printMsg)
-	lenData := int64(len(str) + len(const1) + len(orderNoHexH) + len(orderNoHexL) + len(printInit) + 2 + 4 + len(printData))
-	x1, x2 := int2h8l8(lenData / 2)
-	dataStr := str + x1 + x2 + const1 + orderNoHexH + orderNoHexL + printInit + printData
-	check := getCheckSum(dataStr)
-	return jxutils.Hextob(dataStr + check), err
+	//var (
+	//	content   = printMsg.Content
+	//	orderNo   = printMsg.OrderNo
+	//	str       = "1e"
+	//	const1    = "0200ff50"
+	//	printInit = "1b40" //打印机初始化
+	//	//voice     = "1d6b401dfd001a01015b7631365d736f756e64622cc4fad3d0d0c2b6a9b5a5c0b1" //语音，中国
+	//	//qr                                  = "1d58021b5a0001061600747470733a2f2f7777772e62616964752e636f6d2f1b000A0A0A1B40"
+	//	orderNoHexH, orderNoHexL, printData string
+	//)
+	////写入数据
+	//orderNoHexH, orderNoHexL = int2h8l8(int64(orderNo))
+	//
+	//// 将数据与模板组装
+	//printDataGBK, _ := jxutils.Utf8ToGbk([]byte(replaceContentOther(content)))
+	//printData = hex.EncodeToString(printDataGBK)
+	//printData = replaceContent(printData, printMsg)
+	//lenData := int64(len(str) + len(const1) + len(orderNoHexH) + len(orderNoHexL) + len(printInit) + 2 + 4 + len(printData))
+	//x1, x2 := int2h8l8(lenData / 2)
+	//dataStr := str + x1 + x2 + const1 + orderNoHexH + orderNoHexL + printInit + printData
+	//check := getCheckSum(dataStr)
+	//return jxutils.Hextob(dataStr + check), err
+	return jxutils.Hextob("1e00160200ff5000011b401B5941553d1B5941553e15"), err
 }
 
 //替换特殊字符，上面那个hextob转不了，先替换一下
diff --git a/business/jxstore/event/print_test.go b/business/jxstore/event/print_test.go
index a8901797f..7a905ce63 100644
--- a/business/jxstore/event/print_test.go
+++ b/business/jxstore/event/print_test.go
@@ -16,7 +16,7 @@ func TestPrintMsg(t *testing.T) {
 	msg := &model.PrintMsg{
 		ModelIDCULD: model.ModelIDCULD{},
 		PrintNo:     "20220707000002",
-		Content:     "<center>居中文字</center><br><sound>61</sound><br><sound>62</sound><br>",
+		Content:     "<sound>61</sound><sound>62</sound>",
 		OrderNo:     1,
 		Status:      0,
 		Comment:     "",