aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2018-12-25 15:24:04 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2018-12-25 15:24:04 +0900
commit45f880a670f5fffef72925ecae59c41cd2603e48 (patch)
treec21dbab7732f9fa8ecde48d555c2baa532561bfa
parent687d3fd6162d6415b0e4eb5aaf408f4824e27a0c (diff)
-rw-r--r--homescreen/qml/StatusArea.qml6
-rw-r--r--homescreen/src/homescreenhandler.cpp53
-rw-r--r--homescreen/src/homescreenhandler.h2
-rw-r--r--homescreen/src/main.cpp2
4 files changed, 62 insertions, 1 deletions
diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml
index 89030eb..8d01ea3 100644
--- a/homescreen/qml/StatusArea.qml
+++ b/homescreen/qml/StatusArea.qml
@@ -109,6 +109,12 @@ Item {
font.pixelSize: 32
}
}
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ homescreenHandler.killRunningApplications()
+ }
+ }
}
}
ColumnLayout {
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index c1cff26..04f507a 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -16,8 +16,13 @@
#include "homescreenhandler.h"
#include <functional>
+#include <QProcess>
+#include <dirent.h>
+#include <stdio.h>
#include "hmi-debug.h"
+#define BUF_SIZE 1024
+
void* HomescreenHandler::myThis = 0;
HomescreenHandler::HomescreenHandler(QObject *parent) :
@@ -79,6 +84,54 @@ QString HomescreenHandler::getCurrentApplication()
return current_applciation;
}
+int HomescreenHandler::getPidOfApplication(QString application_name) {
+ DIR *dir = NULL;
+ struct dirent *dir_ent_ptr = NULL;
+ FILE *fp = NULL;
+ char file_path[50] = {0};
+ char cur_task_ame[50] = {0};
+ char buf[BUF_SIZE] = {0};
+ int pid = -1;
+
+ dir = opendir("/proc");
+ if (dir) {
+ while((dir_ent_ptr = readdir(dir)) != NULL) {
+ if ((strcmp(dir_ent_ptr->d_name, ".") == 0) || (strcmp(dir_ent_ptr->d_name, "..") == 0)
+ || (DT_DIR != dir_ent_ptr->d_type))
+ continue;
+ sprintf(file_path, "/proc/%s/status", dir_ent_ptr->d_name);
+ fp = fopen(file_path, "r");
+ if (fp) {
+ if (fgets(buf, BUF_SIZE - 1, fp) == NULL) {
+ fclose(fp);
+ continue;
+ }
+ sscanf(buf, "%*s %s", cur_task_ame);
+ if (0 == strcmp(application_name.toStdString().c_str(), cur_task_ame)) {
+ pid = atoi(dir_ent_ptr->d_name);
+ break;
+ }
+ }
+ }
+ }
+
+ return pid;
+}
+
+void HomescreenHandler::killRunningApplications()
+{
+ QProcess *proc = new QProcess;
+ QProcess *proc2 = new QProcess;
+// int num = getPidOfApplication("afbd-video@0.1");
+// QString procNum = QString::number(num);
+ QString command = "/usr/bin/pkill videoplayer";
+ QString command2 = "/usr/bin/pkill navigation";
+ proc->start(command);
+ proc2->start(command2);
+ HMI_DEBUG("homescreen", command.toStdString().c_str());
+ HMI_DEBUG("homescreen", command2.toStdString().c_str());
+}
+
void HomescreenHandler::onRep_static(struct json_object* reply_contents)
{
static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onRep(reply_contents);
diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h
index 539d380..2858e30 100644
--- a/homescreen/src/homescreenhandler.h
+++ b/homescreen/src/homescreenhandler.h
@@ -34,7 +34,9 @@ public:
Q_INVOKABLE void tapShortcut(QString application_name, bool is_full);
Q_INVOKABLE QString getCurrentApplication();
+ Q_INVOKABLE void killRunningApplications();
void setCurrentApplication(QString application_name);
+ int getPidOfApplication(QString application_name);
void onRep(struct json_object* reply_contents);
void onEv(const string& event, struct json_object* event_contents);
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 6e9dd1c..fe17ceb 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
homescreenHandler->setCurrentApplication(label);
QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label));
}
- if((arrLen == 1) && (QString("navigation") == label)){
+ if((arrLen == 1) && ( (QString("navigation") == label) || (QString("mixer") == label) )){
QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, true));
}else{
QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, false));