From a05aefcef2ad1210415b56c1cc312ea9737dc125 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 17 Jul 2019 09:32:58 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=A3=9E=E9=B9=85=E6=89=93=E5=8D=B0=E6=9C=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/feieapi/feieapi.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/platformapi/feieapi/feieapi.go b/platformapi/feieapi/feieapi.go index 4c1e2d99..f2c7e819 100644 --- a/platformapi/feieapi/feieapi.go +++ b/platformapi/feieapi/feieapi.go @@ -158,21 +158,25 @@ func (a *API) PrinterAddList(printerList []*PrinterInfo) (ok, no map[string]stri }) if err == nil { resultMap := result.(map[string]interface{}) - return interface2PrinterResultList4Add(resultMap["ok"]), interface2PrinterResultList4Add(resultMap["no"]), nil + return interface2PrinterResultList4Add(resultMap["ok"], true), interface2PrinterResultList4Add(resultMap["no"], false), nil } return nil, nil, err } -func interface2PrinterResultList4Add(value interface{}) (printerResultMap map[string]string) { +func interface2PrinterResultList4Add(value interface{}, isOk bool) (printerResultMap map[string]string) { printerResultMap = make(map[string]string) for _, v := range value.([]interface{}) { strList := strings.Split(v.(string), "#") if len(strList) == 4 { - strList2 := strings.Split(strList[3], " ") - if len(strList2) == 1 { - strList2 = append(strList2, "") + if isOk { + strList2 := strings.Split(strList[3], " ") + if len(strList2) == 1 { + strList2 = append(strList2, "") + } + printerResultMap[strList[0]] = strList2[1] + } else { + printerResultMap[strList[0]] = strList[3] } - printerResultMap[strList[0]] = strList2[1] } } return printerResultMap