shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-05 03:23:50 +08:00
Code Issues Projects Releases Wiki Activity

fix drive file read.

Browse Source
This commit is contained in:
Mrs4s 2021-01-19 00:32:14 +08:00
parent 442ede44f3
commit 6f438c7963
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
client/global.go
View File

@ -279,30 +279,30 @@ func (info *DeviceInfo) ReadJson(d []byte) error {
if err := json.Unmarshal(d, &f); err != nil {
return errors.Wrap(err, "failed to unmarshal json message")
}
SetIfNotEmpty := func(trg []byte, str string) {
SetIfNotEmpty := func(trg *[]byte, str string) {
if str != "" {
trg = []byte(str)
*trg = []byte(str)
}
}
SetIfNotEmpty(info.Display, f.Display)
SetIfNotEmpty(info.Product, f.Product)
SetIfNotEmpty(info.Device, f.Device)
SetIfNotEmpty(info.Board, f.Board)
SetIfNotEmpty(info.Brand, f.Brand)
SetIfNotEmpty(info.Model, f.Model)
SetIfNotEmpty(info.Bootloader, f.Bootloader)
SetIfNotEmpty(info.FingerPrint, f.FingerPrint)
SetIfNotEmpty(info.BootId, f.BootId)
SetIfNotEmpty(info.ProcVersion, f.ProcVersion)
SetIfNotEmpty(info.BaseBand, f.BaseBand)
SetIfNotEmpty(info.SimInfo, f.SimInfo)
SetIfNotEmpty(info.OSType, f.OsType)
SetIfNotEmpty(info.MacAddress, f.MacAddress)
SetIfNotEmpty(&info.Display, f.Display)
SetIfNotEmpty(&info.Product, f.Product)
SetIfNotEmpty(&info.Device, f.Device)
SetIfNotEmpty(&info.Board, f.Board)
SetIfNotEmpty(&info.Brand, f.Brand)
SetIfNotEmpty(&info.Model, f.Model)
SetIfNotEmpty(&info.Bootloader, f.Bootloader)
SetIfNotEmpty(&info.FingerPrint, f.FingerPrint)
SetIfNotEmpty(&info.BootId, f.BootId)
SetIfNotEmpty(&info.ProcVersion, f.ProcVersion)
SetIfNotEmpty(&info.BaseBand, f.BaseBand)
SetIfNotEmpty(&info.SimInfo, f.SimInfo)
SetIfNotEmpty(&info.OSType, f.OsType)
SetIfNotEmpty(&info.MacAddress, f.MacAddress)
if len(f.IpAddress) == 4 {
info.IpAddress = []byte{byte(f.IpAddress[0]), byte(f.IpAddress[1]), byte(f.IpAddress[2]), byte(f.IpAddress[3])}
}
SetIfNotEmpty(info.WifiBSSID, f.WifiBSSID)
SetIfNotEmpty(info.WifiSSID, f.WifiSSID)
SetIfNotEmpty(&info.WifiBSSID, f.WifiBSSID)
SetIfNotEmpty(&info.WifiSSID, f.WifiSSID)
if len(f.ImsiMd5) != 0 {
imsiMd5, err := hex.DecodeString(f.ImsiMd5)
if err != nil {
@ -312,11 +312,11 @@ func (info *DeviceInfo) ReadJson(d []byte) error {
if f.IMEI != "" {
info.IMEI = f.IMEI
}
SetIfNotEmpty(info.AndroidId, f.AndroidId)
SetIfNotEmpty(info.APN, f.Apn)
SetIfNotEmpty(&info.AndroidId, f.AndroidId)
SetIfNotEmpty(&info.APN, f.Apn)
info.AndroidId = info.Display // 兼容旧的
SetIfNotEmpty(info.AndroidId, f.Display)
SetIfNotEmpty(&info.AndroidId, f.Display)
switch f.Protocol {
case 1: