This commit is contained in:
suyl
2021-07-30 09:17:51 +08:00
parent fe68ba1dac
commit a57e665cc7

View File

@@ -83,36 +83,36 @@ func (t *TcpClient) handleConn(c net.Conn) {
printNo = string(printNoData)
globals.SugarLogger.Debugf("handleConn printno :[%v]", printNo)
status := printStatus2JxStatus(data[len(data)-8 : len(data)-6])
if t.Clients[printNo] == nil {
//printInfo := &PrintInfo{
// C: c,
// Status: printStatus2JxStatus(data[len(data)-8 : len(data)-6]),
// StatusTime: time.Now(),
//}
//t.Lock()
//t.Clients[printNo] = printInfo
//t.Unlock()
t.addConn(c, printNo, status)
t.buildCallBackMap(printNo)
changePrinterStatus(printNo, status)
if status == printerStatusOnline {
printFail()
}
} else {
//改变打印机状态
//t.Lock()
//if t.Clients[printNo] != nil {
// if t.Clients[printNo].Status != status {
// t.Clients[printNo].Status = status
// }
// t.Clients[printNo].StatusTime = time.Now()
//}
//t.Unlock()
changePrinterStatus(printNo, status)
if t.getPrintStatus(printNo) != status {
t.setPrintStatus(printNo, status)
}
//if t.Clients[printNo] == nil {
//printInfo := &PrintInfo{
// C: c,
// Status: printStatus2JxStatus(data[len(data)-8 : len(data)-6]),
// StatusTime: time.Now(),
//}
//t.Lock()
//t.Clients[printNo] = printInfo
//t.Unlock()
t.addConn(c, printNo, status)
t.buildCallBackMap(printNo)
changePrinterStatus(printNo, status)
if status == printerStatusOnline {
printFail()
}
//} else {
//改变打印机状态
//t.Lock()
//if t.Clients[printNo] != nil {
// if t.Clients[printNo].Status != status {
// t.Clients[printNo].Status = status
// }
// t.Clients[printNo].StatusTime = time.Now()
//}
//t.Unlock()
//changePrinterStatus(printNo, status)
if t.getPrintStatus(printNo) != status {
t.setPrintStatus(printNo, status)
}
//}
} else if strings.Contains(data, printText) {
globals.SugarLogger.Debugf("handleConn print callback: %v", data)
_, printNo = getCallbackMsgInfo(data)