Add QASystemDispatcherProxy as a proxy between QML and C++ for using QASystemDispatcher

Author: benlau

examples/quickandroidexample/Components.qml

@@ -57,6 +57,12 @@ Activity {
             demo : "switch/SwitchDemo.qml"
         }
 
+        ListElement {
+            name : "Notification"
+            preview : ""
+            demo : "notification/NotificationDemo.qml"
+        }
+
     }
 
     ListView {

examples/quickandroidexample/android-sources/src/quickandroid/example/ExampleActivity.java

@@ -54,14 +54,12 @@ public void run() {
                                 m_builder.setSmallIcon(R.drawable.icon);
                             }
 
-                            Log.d("",String.format("notificationManagerNotify(%s)",message));
-
                             m_builder.setContentTitle(title);
                             m_builder.setContentText(message);
                             m_notificationManager.notify(1, m_builder.build());
 
                             // Test function. Remove it later.
-                            SystemDispatcher.dispatch("notificationManagerNotifyFinished");
+                            SystemDispatcher.dispatch("Notifier.notifyFinished");
                         } catch (Exception e) {
                             Log.d("",e.getMessage());
                         }
@@ -93,9 +91,8 @@ public void run() {
             }
 
             public void onDispatched(String name , Map data) {
-                Log.d("","Listener::post");
 
-                if (name.equals("notificationManagerNotify")) {
+                if (name.equals("Notifier.notify")) {
                     notificationManagerNotify(data);
                     return;
                 } else if (name.equals("hapticFeedbackPerform")) {

examples/quickandroidexample/main.cpp

@@ -40,18 +40,9 @@ int main(int argc, char *argv[])
     view.setSource(QUrl(QStringLiteral("qrc:///main.qml")));
     view.show();
 
-
     /* Testing Code. Not needed for regular project */
     Automator* automator = new Automator();
     automator->start();
 
-    QVariantMap message;
-    message.clear();
-    message["title"] = "Quick Android Example";
-    message["message"] = "Hello! It is Quick Android Hello World";
-    QASystemDispatcher::instance()->dispatch("notificationManagerNotify",message);
-
-    view.rootContext()->setContextProperty("SystemMessenger",QASystemDispatcher::instance());
-
     return app.exec();
 }

examples/quickandroidexample/notification/NotificationDemo.qml

@@ -0,0 +1,44 @@
+import QtQuick 2.2
+import QtQuick.Window 2.1
+import QuickAndroid 0.1
+import QuickAndroid.style 0.1
+
+Activity {
+
+    actionBar: ActionBar {
+        id : actionBar
+        title: "Notification"
+        z: 10
+        upEnabled: true
+        onActionButtonClicked: back();
+
+        MaterialShadow {
+            asynchronous: true
+            anchors.fill: actionBar
+            depth: 1
+            z: -1
+        }
+    }
+
+
+    Text {
+        id: label
+        text : "Press to send notification"
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        color : Style.theme.black87
+        font.pixelSize: Style.theme.largeText.textSize * A.dp
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            SystemDispatcher.dispatch("Notifier.notify",{
+                title: "Quick Android Example",
+                message: "Hello!"
+            });
+        }
+    }
+
+}

examples/quickandroidexample/qml.qrc

@@ -19,5 +19,6 @@
         <file>textinput/TextInputDemo.qml</file>
         <file>switch/SwitchDemo.qml</file>
         <file>switch/SwitchPreview.qml</file>
+        <file>notification/NotificationDemo.qml</file>
     </qresource>
 </RCC>

priv/qasystemdispatcherproxy.cpp

@@ -0,0 +1,40 @@
+#include <QtQml>
+#include "qasystemdispatcherproxy.h"
+#include "qasystemdispatcher.h"
+
+QASystemDispatcherProxy::QASystemDispatcherProxy(QObject *parent) : QObject(parent)
+{
+    connect(QASystemDispatcher::instance(),SIGNAL(dispatched(QString,QVariantMap)),
+            this,SIGNAL(dispatched(QString,QVariantMap)));
+
+}
+
+QASystemDispatcherProxy::~QASystemDispatcherProxy()
+{
+
+}
+
+void QASystemDispatcherProxy::dispatch(QString name, QVariantMap message)
+{
+    QASystemDispatcher::instance()->dispatch(name,message);
+}
+
+static QObject *provider(QQmlEngine *engine, QJSEngine *scriptEngine) {
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    QASystemDispatcherProxy* object = new QASystemDispatcherProxy();
+
+    return object;
+}
+
+class QASystemDispatcherProxyRegisterHelper {
+
+public:
+    QASystemDispatcherProxyRegisterHelper() {
+        qmlRegisterSingletonType<QASystemDispatcherProxy>("QuickAndroid", 0, 1,
+                                                          "SystemDispatcher", provider);
+    }
+};
+
+static QASystemDispatcherProxyRegisterHelper registerHelper;

priv/qasystemdispatcherproxy.h

@@ -0,0 +1,21 @@
+#ifndef QASYSTEMDISPATCHERPROXY_H
+#define QASYSTEMDISPATCHERPROXY_H
+
+#include <QObject>
+#include <QVariantMap>
+
+class QASystemDispatcherProxy : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QASystemDispatcherProxy(QObject *parent = 0);
+    ~QASystemDispatcherProxy();
+
+    Q_INVOKABLE void dispatch(QString name, QVariantMap message);
+
+signals:
+    void dispatched(QString name , QVariantMap data);
+
+};
+
+#endif // QASYSTEMDISPATCHERPROXY_H

qasystemdispatcher.cpp

@@ -116,7 +116,7 @@ static jobject createHashMap(const QVariantMap &data) {
     while (iter.hasNext()) {
         iter.next();
 
-        qDebug() << iter.key() << iter.value();
+//        qDebug() << iter.key() << iter.value();
         QString key = iter.key();
         jstring jkey = env->NewStringUTF(key.toLocal8Bit().data());
         QVariant v = iter.value();

quickandroid.pri

@@ -7,12 +7,14 @@ RESOURCES += $$PWD/QuickAndroid/quickandroid.qrc
 HEADERS += \
     $$PWD/quickandroid.h \
     $$PWD/qadrawableprovider.h \
-    $$PWD/qasystemdispatcher.h
+    $$PWD/qasystemdispatcher.h \
+    $$PWD/priv/qasystemdispatcherproxy.h
 
 SOURCES += \
     $$PWD/quickandroid.cpp \
     $$PWD/qadrawableprovider.cpp \
-    $$PWD/qasystemdispatcher.cpp
+    $$PWD/qasystemdispatcher.cpp \
+    $$PWD/priv/qasystemdispatcherproxy.cpp
 
 android {
     QT += androidextras