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

controllers/js/jsyb_controller.go

@@ -528,7 +528,7 @@ func (c *JSybController) GetBasBaseInfo() string {
 	fmt.Println("!!!!!")
 	str := make([]byte, 2048)
 	str1 := make([]byte, 8192)
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), (uintptr)(unsafe.Pointer(&str1[0])))
 	fmt.Println(string(str1))
 	fmt.Println(string(str))
 	//fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))