mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 16:32:33 +02:00
Fix critical bug when sending debug message not parsing appID
Remove spammign debug messages
This commit is contained in:
parent
d0219191c0
commit
7411697e1c
@ -122,7 +122,7 @@ void InstalledListModel::loadScreens()
|
||||
if (!obj.contains("type")) {
|
||||
obj.insert("type", "video");
|
||||
}
|
||||
qDebug() << fileEnding << obj.value("type");
|
||||
|
||||
if (fileEnding.endsWith(".webm") || (obj.value("type").toString() == "qmlScene") || fileEnding.endsWith(".html"))
|
||||
emit addInstalledItem(obj, item.baseName());
|
||||
}
|
||||
|
@ -16,7 +16,6 @@ SDKConnector::SDKConnector(QObject* parent)
|
||||
|
||||
void SDKConnector::readyRead()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void SDKConnector::newConnection()
|
||||
@ -27,6 +26,7 @@ void SDKConnector::newConnection()
|
||||
void SDKConnector::closeAllWallpapers()
|
||||
{
|
||||
for (int i = 0; i < m_clients.size(); ++i) {
|
||||
qDebug() << m_clients.data()->get()->appID();
|
||||
m_clients.at(i)->close();
|
||||
m_clients.clear();
|
||||
m_clients.squeeze();
|
||||
@ -36,11 +36,8 @@ void SDKConnector::closeAllWallpapers()
|
||||
void SDKConnector::closeWallpapersAt(int at)
|
||||
{
|
||||
for (int i = 0; i < m_clients.size(); ++i) {
|
||||
qDebug() << i << m_clients.length();
|
||||
if(m_clients.at(i).data()->monitor().size() > 0){
|
||||
|
||||
if(m_clients.at(i).data()->monitor().at(0) == at){
|
||||
qDebug() << "SDKC" << i ;
|
||||
if (m_clients.at(i).data()->monitor().size() > 0) {
|
||||
if (m_clients.at(i).data()->monitor().at(0) == at) {
|
||||
m_clients.at(i).data()->close();
|
||||
}
|
||||
} else {
|
||||
@ -49,11 +46,11 @@ void SDKConnector::closeWallpapersAt(int at)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void SDKConnector::setWallpaperValue(QString appID, QString key, QString value)
|
||||
{
|
||||
|
||||
for (int i = 0; i < m_clients.count(); ++i) {
|
||||
qDebug() << appID << " " << m_clients.at(i).data()->appID() << " " << m_clients.count() << " " << key << " " << value;
|
||||
if (m_clients.at(i).data()->appID() == appID) {
|
||||
QJsonObject obj;
|
||||
obj.insert(key, QJsonValue(value));
|
||||
@ -70,7 +67,7 @@ void SDKConnector::setSceneValue(QString appID, QString key, QString value)
|
||||
for (int i = 0; i < m_clients.count(); ++i) {
|
||||
if (m_clients.at(i).data()->appID() == appID) {
|
||||
QJsonObject obj;
|
||||
obj.insert("type",QJsonValue("qmlScene"));
|
||||
obj.insert("type", QJsonValue("qmlScene"));
|
||||
obj.insert(key, QJsonValue(value));
|
||||
|
||||
QByteArray send = QJsonDocument(obj).toJson();
|
||||
@ -80,7 +77,6 @@ void SDKConnector::setSceneValue(QString appID, QString key, QString value)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QLocalSocket* SDKConnection::socket() const
|
||||
{
|
||||
return m_socket;
|
||||
|
@ -79,13 +79,18 @@ signals:
|
||||
public slots:
|
||||
void readyRead()
|
||||
{
|
||||
QString msg = QString(m_socket->readAll());
|
||||
qDebug() << "SDK CONNECTOR "<< msg;
|
||||
if (msg.startsWith("appID=")) {
|
||||
m_appID = msg.remove("appID=");
|
||||
|
||||
qDebug() << m_appID << m_monitor;
|
||||
QString msg = QString(m_socket->readAll());
|
||||
|
||||
// The first message allways contains the appID
|
||||
if (msg.startsWith("appID=")) {
|
||||
//Only use the first 32 chars for the appID
|
||||
m_appID = msg.remove("appID=").mid(0,32);
|
||||
msg.remove(m_appID);
|
||||
|
||||
qDebug() << "### APPID:\t "<< m_appID << "\n### Monitor: "<< m_monitor.at(0);
|
||||
}
|
||||
qDebug() << "SDK CONNECTOR "<< msg;
|
||||
}
|
||||
|
||||
void disconnected()
|
||||
@ -95,6 +100,7 @@ public slots:
|
||||
|
||||
void close()
|
||||
{
|
||||
m_socket->disconnect();
|
||||
m_socket->close();
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ void redirectMessageOutputToMainWindow(QtMsgType type, const QMessageLogContext&
|
||||
|
||||
switch (type) {
|
||||
case QtDebugMsg:
|
||||
localMsg = "SDK START: " /*+ QByteArray::fromStdString(global_sdkPtr->contentType().toStdString()) + " "*/ + localMsg + " SDK END!";
|
||||
localMsg = " SDK START: " /*+ QByteArray::fromStdString(global_sdkPtr->contentType().toStdString()) + " "*/ + localMsg + " SDK END!";
|
||||
global_sdkPtr->redirectMessage(localMsg);
|
||||
break;
|
||||
case QtInfoMsg:
|
||||
@ -85,7 +85,6 @@ void ScreenPlaySDK::readyRead()
|
||||
QJsonObject ob = doc.object();
|
||||
QJsonObject::iterator iterator;
|
||||
for (iterator = ob.begin(); iterator != ob.end(); iterator++) {
|
||||
qDebug() << iterator.key() << ob.value(iterator.key()).toString();
|
||||
emit incommingMessage(iterator.key(), ob.value(iterator.key()).toString());
|
||||
}
|
||||
}
|
||||
|
@ -19,7 +19,6 @@ SPWidgetmainwindow::SPWidgetmainwindow(QString projectPath, QString appid, QScre
|
||||
}
|
||||
m_project = configJsonDocument.object();
|
||||
QString fullPath = projectPath + "/" + m_project.value("file").toString();
|
||||
qDebug() << fullPath;
|
||||
|
||||
m_quickRenderer = QSharedPointer<QQmlApplicationEngine>(new QQmlApplicationEngine());
|
||||
m_quickRenderer.data()->rootContext()->setContextProperty("backend", this);
|
||||
|
Loading…
Reference in New Issue
Block a user