Added json from android parsing

little fixes
km2442 · May 24, 2019 · ae670cd · ae670cd
1 parent 0ab3364
commit ae670cd
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 12 deletions.
diff --git a/Windows/AutoSwitch/AutoSwitch.pro b/Windows/AutoSwitch/AutoSwitch.pro
@@ -17,6 +17,7 @@ SOURCES += \
     Source/Classes/communicatorthread.cpp \
     Source/Classes/database.cpp \
     Source/Classes/databasepass.cpp \
+    Source/Classes/jsonactionparser.cpp \
     Source/Classes/mybutton.cpp \
     Source/Classes/socketcommunicator.cpp \
     Source/Dialogs/firstrun.cpp \
@@ -37,6 +38,7 @@ SOURCES += \
 HEADERS  += \
     Source/Classes/communicatorthread.h \
     Source/Classes/database.h \
+    Source/Classes/jsonactionparser.h \
     Source/Classes/mybutton.h \
     Source/Classes/socketcommunicator.h \
     Source/Dialogs/firstrun.h \

diff --git a/Windows/AutoSwitch/Source/Classes/communicatorthread.cpp b/Windows/AutoSwitch/Source/Classes/communicatorthread.cpp
@@ -33,7 +33,14 @@ void CommunicatorThread::readyRead()
 
     qDebug() << socketDescriptor << " Data in: " << Data;
 
-    socket->write(Data);
+    //socket->write(Data);
+
+    QJsonDocument jsonResponse = QJsonDocument::fromJson(Data);
+    QJsonObject jsonObject = jsonResponse.object();
+
+    JsonActionParser *jap = JsonActionParser::getInstance();
+    if(jsonObject.value("Exec").toString() == "AddTask") jap->parseNewAction(jsonObject);
+
 }
 
 void CommunicatorThread::disconnected()

diff --git a/Windows/AutoSwitch/Source/Classes/communicatorthread.h b/Windows/AutoSwitch/Source/Classes/communicatorthread.h
@@ -3,8 +3,10 @@
 
 #include <QThread>
 #include <QTcpSocket>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include "Source/Main/mainwindow.h"
-
+#include "Source/Classes/jsonactionparser.h"
 
 class CommunicatorThread : public QThread
 {

diff --git a/Windows/AutoSwitch/Source/Classes/jsonactionparser.cpp b/Windows/AutoSwitch/Source/Classes/jsonactionparser.cpp
@@ -0,0 +1,38 @@
+#include "jsonactionparser.h"
+
+JsonActionParser JsonActionParser::japInstance;
+
+JsonActionParser::JsonActionParser()
+{
+
+}
+
+bool JsonActionParser::parseNewAction(QJsonObject jsonObject)
+{
+    Task task;
+    if(jsonObject.value("Action").toString() == "Shutdown") task.mode = 'w';
+    else if(jsonObject.value("Action").toString() == "Reboot") task.mode = 'r';
+    else if(jsonObject.value("Action").toString() == "Sleep") task.mode = 'u';
+    else if(jsonObject.value("Action").toString() == "Hibernate") task.mode = 'h';
+    else if(jsonObject.value("Action").toString() == "Lock") task.mode = 'l';
+    else if(jsonObject.value("Action").toString() == "Block") task.mode = 'b';
+    else if(jsonObject.value("Action").toString() == "MonitorOff") task.mode = 'm';
+    else return false;
+
+    if(jsonObject.value("TimeMode").toString() == "Now")
+    {
+        switch(task.mode)
+        {
+        case 'm': monitorOff(); break;
+        default: return false;
+        }
+        return true;
+    }
+    else if(jsonObject.value("TimeMode").toString() == "Seconds")
+    {
+
+    }
+    else return false;
+
+    return true;
+}
diff --git a/Windows/AutoSwitch/Source/Classes/jsonactionparser.h b/Windows/AutoSwitch/Source/Classes/jsonactionparser.h
@@ -0,0 +1,20 @@
+#pragma once
+#include "QJsonDocument"
+#include "QJsonObject"
+
+#include "Source/Main/functions.h"
+#include "Source/Main/structures.h"
+
+using namespace std;
+
+class JsonActionParser
+{
+public:
+    JsonActionParser();
+    static JsonActionParser *getInstance() { return &japInstance; }
+
+    bool parseNewAction(QJsonObject jsonObject);
+
+private:
+    static JsonActionParser japInstance;
+};
diff --git a/Windows/AutoSwitch/Source/Main/mainwindow.cpp b/Windows/AutoSwitch/Source/Main/mainwindow.cpp
@@ -475,11 +475,6 @@ void MainWindow::showMainWindow()
     else this->showNormal();
 }
 
-void MainWindow::appendSocket(QString s)
-{
-    ui->SocketOutput->append(s);
-}
-
 void MainWindow::hideApp()
 {
     Settings *s = Settings::getInstance();

diff --git a/Windows/AutoSwitch/Source/Main/mainwindow.h b/Windows/AutoSwitch/Source/Main/mainwindow.h
@@ -47,7 +47,6 @@ class MainWindow : public QMainWindow
     explicit MainWindow(QWidget *parent = 0);
     //static MainWindow* getInstance() { return &mainwindowInstance; }
     void showMainWindow();
-    void appendSocket(QString s);
     ~MainWindow();
 
 private slots:

diff --git a/Windows/AutoSwitch/Source/Main/structures.h b/Windows/AutoSwitch/Source/Main/structures.h
@@ -1,5 +1,4 @@
-#ifndef STRUCTURES_H
-#define STRUCTURES_H
+#pragma once
 #include <QDateTime>
 
 struct TaskTime
@@ -32,5 +31,3 @@ struct Task
 //    bool force = 0;
 //    short taskNumber = 0;
 //};
-
-#endif // STRUCTURES_H