first json parse code

This commit is contained in:
Rafael 2016-03-21 20:44:07 +01:00
parent 1462f9ef1c
commit 4050358462
14 changed files with 99 additions and 7 deletions

View file

@ -92,15 +92,12 @@ bool SnapmaticPicture::readingPicture()
if (!picFile->isReadable())
{
lastStep = "2;/3,ReadingFile," + convertDrawStringForLog(picFileName) + ",3,NOJSON";
qDebug() << lastStep;
}
else if (picFile->read(4) != "JSON")
{
lastStep = "2;/3,ReadingFile," + convertDrawStringForLog(picFileName) + ",3,CTJSON";
qDebug() << lastStep;
}
QByteArray jsonRawContent = picFile->read(jsonStreamLength);
qDebug() << jsonRawContent.toHex();
jsonStr = getSnapmaticJSONString(jsonRawContent);
return cachePicture.loadFromData(jpegRawContent);
@ -111,7 +108,7 @@ QString SnapmaticPicture::getSnapmaticPictureString(QByteArray snapmaticHeader)
QByteArray snapmaticUsefulBytes = snapmaticHeader.left(snapmaticUsefulLength);
snapmaticUsefulBytes.replace(QByteArray::fromHex("00"),"");
snapmaticUsefulBytes.replace(QByteArray::fromHex("01"),"");
return QString::fromAscii(snapmaticUsefulBytes);
return QString::fromLatin1(snapmaticUsefulBytes);
}
QString SnapmaticPicture::getSnapmaticJSONString(QByteArray jsonBytes)
@ -119,7 +116,7 @@ QString SnapmaticPicture::getSnapmaticJSONString(QByteArray jsonBytes)
QByteArray jsonUsefulBytes = jsonBytes;
jsonUsefulBytes.replace(QByteArray::fromHex("00"),"");
jsonUsefulBytes.replace(QByteArray::fromHex("0C"),"");
return QString::fromAscii(jsonUsefulBytes);
return QString::fromLatin1(jsonUsefulBytes);
}
bool SnapmaticPicture::readingPictureFromFile(QString fileName)