From 3c804a94a22289ab766243629c41ba96ac989bd7 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Sun, 20 Oct 2019 11:50:59 -0400
Subject: Fixes to improve interoperation with tbtnavi

Changes include:
- Add support for actually sending stopDemo and Arrived DBus signals.
- Fix typo in Arrived signal name in org.agl.naviapi.xml and
  dbus_server.cpp.
- Change some qDebug messages in dbus_server.cpp to qWarning as it
  seems more appropriate.
- Actually use Mapbox style URL from naviconfig.ini.

Bug-AGL: SPEC-2916

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib32bcc50a495538362c5ca77c9de3941d81c17bf
---
 app/dbus_server.cpp | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

(limited to 'app/dbus_server.cpp')

diff --git a/app/dbus_server.cpp b/app/dbus_server.cpp
index 57fa3d5..99ae363 100644
--- a/app/dbus_server.cpp
+++ b/app/dbus_server.cpp
@@ -20,21 +20,21 @@ void DBus_Server::initDBus(){
     new NaviapiAdaptor(this);
 
     if (!QDBusConnection::sessionBus().registerService(m_pathName))
-        qDebug() << m_serverName << "registerService() failed";
+        qWarning() << m_serverName << "registerService() failed";
 
     if (!QDBusConnection::sessionBus().registerObject(m_objName, this))
-        qDebug() << m_serverName << "registerObject() failed";
+        qWarning() << m_serverName << "registerObject() failed";
 
-    QDBusConnection	sessionBus = QDBusConnection::connectToBus(QDBusConnection::SessionBus, m_serverName);
+    QDBusConnection sessionBus = QDBusConnection::connectToBus(QDBusConnection::SessionBus, m_serverName);
     if (!sessionBus.isConnected()) {
-        qDebug() << m_serverName << "connectToBus() failed";
+        qWarning() << m_serverName << "connectToBus() failed";
     }
 
     //for receive dbus signal
     org::agl::naviapi *mInterface;
     mInterface = new org::agl::naviapi(QString(),QString(),QDBusConnection::sessionBus(),this);
     if (!connect(mInterface,SIGNAL(getRouteInfo()),this,SLOT(getRouteInfoSlot()))){
-        qDebug() << m_serverName << "sessionBus.connect():getRouteInfoSlot failed";
+        qWarning() << m_serverName << "sessionBus.connect():getRouteInfoSlot failed";
     }
 
 }
@@ -43,29 +43,37 @@ void DBus_Server::initAPIs(QObject *parent){
 
     if(!QObject::connect(this,SIGNAL(doGetRouteInfo()),
                          parent,SLOT(doGetRouteInfoSlot()))) {
-        qDebug() << m_serverName << "cppSIGNAL:doGetRouteInfo to qmlSLOT:doGetRouteInfoSlot connect is failed";
+        qWarning() << m_serverName << "cppSIGNAL:doGetRouteInfo to qmlSLOT:doGetRouteInfoSlot connect failed";
     }
 
     if(!QObject::connect(parent,SIGNAL(qmlSignalRouteInfo(double,double,double,double)),
                          this,SLOT(sendSignalRouteInfo(double,double,double,double)))) {
-        qDebug() << m_serverName << "qmlSIGNAL:qmlSignalRouteInfo to cppSLOT:sendSignalRouteInfo connect is failed";
+        qWarning() << m_serverName << "qmlSIGNAL:qmlSignalRouteInfo to cppSLOT:sendSignalRouteInfo connect failed";
     }
 
     if(!QObject::connect(parent,SIGNAL(qmlSignalPosInfo(double,double,double,double)),
                          this,SLOT(sendSignalPosInfo(double,double,double,double)))) {
-        qDebug() << m_serverName << "qmlSIGNAL:qmlSignalPosInfo to cppSLOT:sendSignalPosInfo connect is failed";
+        qWarning() << m_serverName << "qmlSIGNAL:qmlSignalPosInfo to cppSLOT:sendSignalPosInfo connect failed";
+    }
+
+    if(!QObject::connect(parent,SIGNAL(qmlSignalStopDemo()),
+                         this,SLOT(sendSignalStopDemo()))) {
+        qWarning() << m_serverName << "qmlSIGNAL:qmlSignalStopDemo to cppSLOT:sendSignalStopDemo connect failed";
+    }
+
+    if(!QObject::connect(parent,SIGNAL(qmlSignalArrived()),
+                         this,SLOT(sendSignalArrived()))) {
+        qWarning() << m_serverName << "qmlSIGNAL:qmlSignalArrived to cppSLOT:sendSignalArrived connect failed";
     }
 }
 
 void DBus_Server::getRouteInfoSlot(){
-    qDebug() << "call getRouteInfoSlot ";
     emit doGetRouteInfo();
     return;
 }
 
 // Signal
 void DBus_Server::sendSignalRouteInfo(double srt_lat, double srt_lon, double end_lat, double end_lon){
-    qDebug() << "call sendSignalRouteInfo ";
     QDBusMessage message = QDBusMessage::createSignal(m_objName,
                                                      org::agl::naviapi::staticInterfaceName(),
                                                      "signalRouteInfo");
@@ -82,3 +90,19 @@ void DBus_Server::sendSignalPosInfo(double lat, double lon, double drc, double d
     QDBusConnection::sessionBus().send(message);
     return;
 }
+
+void DBus_Server::sendSignalStopDemo(void){
+    QDBusMessage message = QDBusMessage::createSignal(m_objName,
+                                                     org::agl::naviapi::staticInterfaceName(),
+                                                     "signalStopDemo");
+    QDBusConnection::sessionBus().send(message);
+    return;
+}
+
+void DBus_Server::sendSignalArrived(void){
+    QDBusMessage message = QDBusMessage::createSignal(m_objName,
+                                                     org::agl::naviapi::staticInterfaceName(),
+                                                     "signalArrived");
+    QDBusConnection::sessionBus().send(message);
+    return;
+}
-- 
cgit 1.2.3-korg