aa
This commit is contained in:
@@ -297,14 +297,9 @@ func (t *TcpClient) doPrint2(printMsgChan chan *model.PrintMsg) (err error) {
|
|||||||
globals.SugarLogger.Debugf("handleTcpMessages success, data: %v", hex.EncodeToString(data))
|
globals.SugarLogger.Debugf("handleTcpMessages success, data: %v", hex.EncodeToString(data))
|
||||||
//printMsg.Status = printMsgAlreadySend
|
//printMsg.Status = printMsgAlreadySend
|
||||||
//dao.UpdateEntity(db, printMsg, "Status")
|
//dao.UpdateEntity(db, printMsg, "Status")
|
||||||
if t.CallBackMap[printMsg.PrintNo] != nil {
|
dataStr := <-t.CallBackMap[printMsg.PrintNo]
|
||||||
select {
|
a, b := getCallbackMsgInfo(dataStr)
|
||||||
case dataStr := <-t.CallBackMap[printMsg.PrintNo]:
|
t.changePrintMsg(dataStr, a, b)
|
||||||
a, b := getCallbackMsgInfo(dataStr)
|
|
||||||
t.changePrintMsg(dataStr, a, b)
|
|
||||||
case <-timeoutChan:
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//dataStr := <-printMsgCallbackChan
|
//dataStr := <-printMsgCallbackChan
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,7 +149,6 @@ func (t *TcpClient) buildCallBackMap(key string) {
|
|||||||
defer t.Unlock()
|
defer t.Unlock()
|
||||||
dataChan := make(chan string, 1024)
|
dataChan := make(chan string, 1024)
|
||||||
t.CallBackMap[key] = dataChan
|
t.CallBackMap[key] = dataChan
|
||||||
timeoutChan <- 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TcpClient) getPrintStatus(key string) int {
|
func (t *TcpClient) getPrintStatus(key string) int {
|
||||||
|
|||||||
Reference in New Issue
Block a user