Merge branch 'develop' into hotfix/dynamically_link_libraries

Author: Jack-Byrne

CMakeLists.txt

@@ -39,7 +39,6 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/platform.cmake)
 #Jenkins integration section
 #dont modify this section if you dont know details about integration with Jenkins!!!
 set (HMI "web" CACHE STRING "HMI type")
-option(HMI2 "Use Qt HMI" OFF)
 option(EXTENDED_MEDIA_MODE "Turn on and off extended Madia Manager features relates to PulseAudio A2DP and GStreamer" OFF)
 option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OFF)" OFF)
 option(BUILD_BT_SUPPORT "Bluetooth support" ON)
@@ -90,15 +89,12 @@ else ()
 endif()
 
 if (HMI_TYPE_OPTION)
-  if (${HMI_TYPE_OPTION} STREQUAL "HTML5")
-    message(STATUS "Jenkins integration: select HTML5 HMI")
-    set (HMI "web")
-  elseif (${HMI_TYPE_OPTION} STREQUAL "NONE")
+  if (${HMI_TYPE_OPTION} STREQUAL "NONE")
     message(STATUS "Jenkins integration: select HMI none")
     set (HMI "no")
   else ()
-    message(STATUS "Jenkins integration: select QML HMI none")
-    set (HMI "qt")
+    message(STATUS "Jenkins integration: select HTML5 HMI")
+    set (HMI "web")
   endif()
 endif()
 
@@ -324,48 +320,17 @@ if (EXTENDED_MEDIA_MODE)
   add_definitions(${GLIB2_CFLAGS})
 endif()
 
-if(HMI STREQUAL "qt")
-  if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
-    set(qt_version "4.8.5")
-  else()
-    set(qt_version "5.1.0")
-  endif()
-
-  execute_process(
-    COMMAND ${CMAKE_SOURCE_DIR}/FindQt.sh -v ${qt_version}
-    OUTPUT_VARIABLE qt_bin_dir
-  )
-  message(STATUS "Binary directory Qt ${qt_version} is ${qt_bin_dir}")
-  set(ENV{PATH} ${qt_bin_dir}:$ENV{PATH})
-
-  if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
-    find_package(Qt4 ${qt_version} REQUIRED QtCore QtGui QtDBus QtDeclarative)
-  else ()
-    find_package(Qt5Core REQUIRED)
-    find_package(Qt5DBus REQUIRED)
-    find_package(Qt5Qml REQUIRED)
-    find_package(Qt5Quick REQUIRED)
-    set(qmlplugindump_binary ${qt_bin_dir}/qmlplugindump)
-  endif()
-endif()
-
 # Building application
 
 # --- Type HMI
-if (HMI STREQUAL "qt")
-    set(QT_HMI ON)
-    add_definitions(-DQT_HMI)
-elseif (HMI STREQUAL "web")
+if (HMI STREQUAL "web")
     set(WEB_HMI ON)
     add_definitions(-DWEB_HMI)
 else ()
     set(HMI "no")
     add_definitions(-DNO_HMI)
 endif ()
 
-if (HMI STREQUAL "qt" AND NOT DEFINED HMIADAPTER)
-    set(HMIADAPTER "dbus")
-endif()
 if (HMI STREQUAL "web" AND NOT DEFINED HMIADAPTER)
     set(HMIADAPTER "messagebroker")
 endif()

FindQt.sh

@@ -65,7 +65,6 @@ The dependencies for SDL Core vary based on the configuration. You can change SD
 | Flag | Description | Dependencies |
 |------|-------------|--------------|
 |Web HMI|Use HTML5 HMI|chromium-browser|
-|HMI2|Build with QT HMI|QT5, dbus-*dev|
 |EXTENDED_MEDIA_MODE|Support Video and Audio Streaming|Opengl es2, gstreamer1.0*|
 |Bluetooth|Enable bluetooth transport adapter|libbluetooth3, libbluetooth-dev, bluez-tools|
 |Testing framework|Needed to support running unit tests|libgtest-dev|

README.md

@@ -153,6 +153,7 @@ bool LifeCycle::StartComponents() {
   security_manager_->AddListener(app_manager_);
 
   app_manager_->AddPolicyObserver(crypto_manager_);
+  app_manager_->AddPolicyObserver(protocol_handler_);
   if (!crypto_manager_->Init()) {
     LOG4CXX_ERROR(logger_, "CryptoManager initialization fail.");
     return false;

src/appMain/life_cycle.cc

@@ -90,23 +90,6 @@ bool InitHmi(std::string hmi_link) {
       .Execute();
 }
 #endif  // WEB_HMI
-
-#ifdef QT_HMI
-/**
- * Initialize HTML based HMI.
- * @return true if success otherwise false.
- */
-bool InitHmi() {
-  std::string kStartHmi = "./start_hmi.sh";
-  struct stat sb;
-  if (stat(kStartHmi.c_str(), &sb) == -1) {
-    LOG4CXX_FATAL(logger_, "HMI start script doesn't exist!");
-    return false;
-  }
-
-  return utils::System(kStartHmi).Execute();
-}
-#endif  // QT_HMI
 }
 
 /**
@@ -178,16 +161,13 @@ int32_t main(int32_t argc, char** argv) {
     if (profile_instance.server_address() == kLocalHostAddress) {
       LOG4CXX_INFO(logger_, "Start HMI on localhost");
 
-#ifndef NO_HMI
 #ifdef WEB_HMI
-
       if (!InitHmi(profile_instance.link_to_web_hmi())) {
         LOG4CXX_INFO(logger_, "InitHmi successful");
       } else {
         LOG4CXX_WARN(logger_, "Failed to init HMI");
       }
 #endif
-#endif  // #ifndef NO_HMI
     }
   }
   // --------------------------------------------------------------------------

src/appMain/main.cc

@@ -13,10 +13,10 @@
             625],
             "endpoints": {
                 "0x07": {
-                    "default": ["http://policies.telematics.ford.com/api/policies"]
+                    "default": ["http://localhost:3000/api/1/policies/proprietary"]
                 },
                 "0x04": {
-                    "default": ["http://ivsu.software.ford.com/api/getsoftwareupdates"]
+                    "default": ["http://localhost:3000/api/1/softwareUpdate"]
                 },
                 "queryAppsUrl": {
                     "default": ["http://sdl.shaid.server"]

src/appMain/sdl_preloaded_pt.json

@@ -89,6 +89,12 @@ ReadDIDRequest = 5, 1
 GetVehicleDataRequest = 5, 1
 PluginFolder = plugins
 
+; The time used during switch transport procedure
+AppTransportChangeTimer = 500
+
+; The time used as addition for AppTransportChangeTimer
+AppTransportChangeTimerAddition = 0
+
 [MEDIA MANAGER]
 ; where 3 is a number of retries and 1000 is a timeout in milliseconds for request frequency
 StartStreamRetry = 3, 1000

src/appMain/smartDeviceLink.ini

@@ -324,6 +324,7 @@ set (HMI_COMMANDS_SOURCES
   ${COMMANDS_SOURCE_DIR}/hmi/on_system_error_notification.cc
   ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_system_request.cc
   ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_system_response.cc
+  ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_on_awake_sdl.cc
   ${COMMANDS_SOURCE_DIR}/hmi/sdl_policy_update.cc
   ${COMMANDS_SOURCE_DIR}/hmi/sdl_policy_update_response.cc
   ${COMMANDS_SOURCE_DIR}/hmi/on_received_policy_update.cc