Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -14,6 +14,7 @@ import (
 	"strconv"
 	"strings"
 	//"strings"
+	"golang.org/x/text/encoding/simplifiedchinese"
 	"syscall"
 	"time"
 	"unsafe"
@@ -1711,7 +1712,7 @@ func ReadCardGetCode(request string) (string, string) {
 	ret4, _, _ := readCards.Call(StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
 	fmt.Println(":", string(str3))
 
-	//fmt.Println(":",ConvertByte2String(str3,GB18030) )
+	fmt.Println(":", ConvertByte2String(str3, GB18030))
 
 	if ret4 == 0 {
 		result := string(str3)
@@ -2715,24 +2716,25 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 //	}
 //}
 
-//type Charset string
+type Charset string
 
-//const (
-//	UTF8    = Charset("UTF-8")
-//	GB18030 = Charset("GB18030")
-//)
-//func ConvertByte2String(byte []byte, charset Charset) string {
-//
-//	var str string
-//	switch charset {
-//	case GB18030:
-//		decodeBytes, _ := simplifiedchinese.GB18030.NewDecoder().Bytes(byte)
-//		str = string(decodeBytes)
-//	case UTF8:
-//		fallthrough
-//	default:
-//		str = string(byte)
-//	}
-//
-//	return str
-//}
+const (
+	UTF8    = Charset("UTF-8")
+	GB18030 = Charset("GB18030")
+)
+
+func ConvertByte2String(byte []byte, charset Charset) string {
+
+	var str string
+	switch charset {
+	case GB18030:
+		decodeBytes, _ := simplifiedchinese.GB18030.NewDecoder().Bytes(byte)
+		str = string(decodeBytes)
+	case UTF8:
+		fallthrough
+	default:
+		str = string(byte)
+	}
+
+	return str
+}