X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flibhomescreen.cpp;h=dd5d3630acc33c25fd474871006bf2a12652332c;hb=refs%2Ftags%2Flamprey_11.92.0;hp=121def728a37f0cc40bfea1a9a0bb7e5f663e2fd;hpb=11e5020569efe21957c3079c20ffd5f69f514d7a;p=src%2Flibhomescreen.git

diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp
index 121def7..dd5d363 100644
--- a/src/libhomescreen.cpp
+++ b/src/libhomescreen.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018,2019 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +48,8 @@ const std::vector<std::string> LibHomeScreen::api_list {
 	std::string("hideWindow"),
 	std::string("replyShowWindow"),
 	std::string("showNotification"),
-	std::string("showInformation")
+	std::string("showInformation"),
+	std::string("getRunnables")
 };
 
 const std::vector<std::string> LibHomeScreen::event_list {
@@ -59,6 +61,7 @@ const std::vector<std::string> LibHomeScreen::event_list {
 	std::string("replyShowWindow"),
 	std::string("showNotification"),
 	std::string("showInformation"),
+	std::string("application-list-changed"),
 	std::string("none")
 };
 
@@ -120,8 +123,9 @@ LibHomeScreen::~LibHomeScreen()
  * This function is initializer
  *
  * #### Parameters
- * - port  [in] : This argument should be specified to the port number to be used for websocket
- * - token [in] : This argument should be specified to the token to be used for websocket
+ * - hostname [in] : This argument should be specified to the hostname to be used for websocket
+ * - port     [in] : This argument should be specified to the port number to be used for websocket
+ * - token    [in] : This argument should be specified to the token to be used for websocket
  *
  * #### Return
  * Nothing
@@ -130,20 +134,16 @@ LibHomeScreen::~LibHomeScreen()
  * Use this constructor
  *
  */
-int LibHomeScreen::init(const int port, const string& token)
+int LibHomeScreen::init(const char *hostname, const int port, const char *token)
 {
 	int ret = 0;
-	if(port > 0 && token.size() > 0)
-	{
-		mport = port;
-		mtoken = token;
-	}
-	else
+	if(port < 0 || token == nullptr || token[0] == 0)
 	{
 		HMI_ERROR("libhomescreen","port and token should be > 0, Initial port and token uses.");
 	}
 
-	ret = initialize_websocket();
+	ret = initialize_websocket(hostname, port, token);
+
 	if(ret != 0 )
 	{
 		HMI_ERROR("libhomescreen","Failed to initialize websocket");
@@ -155,6 +155,25 @@ int LibHomeScreen::init(const int port, const string& token)
 	return ret;
 }
 
+/**
+ * This function is initializer
+ *
+ * #### Parameters
+ * - port  [in] : This argument should be specified to the port number to be used for websocket
+ * - token [in] : This argument should be specified to the token to be used for websocket
+ *
+ * #### Return
+ * Nothing
+ *
+ * #### Note
+ * Use this constructor
+ *
+ */
+int LibHomeScreen::init(const int port, const string& token)
+{
+	return init(nullptr, port, token.c_str());
+}
+
 /**
  * This function register callback function for reply/event message from home screen
  *
@@ -184,6 +203,7 @@ int LibHomeScreen::initialize_websocket()
 	mploop = NULL;
 	onEvent = nullptr;
 	onReply = nullptr;
+
 	int ret = sd_event_new(&mploop);
 	if(ret < 0)
 	{
@@ -201,7 +221,7 @@ int LibHomeScreen::initialize_websocket()
 	minterface.on_hangup = _on_hangup_static;
 	minterface.on_call = _on_call_static;
 	minterface.on_event = _on_event_static;
-	muri += "ws://localhost:" + to_string(mport) + "/api?token=" + mtoken; /*To be modified*/
+
 	sp_websock = afb_ws_client_connect_wsj1(mploop, muri.c_str(), &minterface, this);
 	if(sp_websock == NULL)
 	{
@@ -217,6 +237,16 @@ END:
 	return -1;
 }
 
+int LibHomeScreen::initialize_websocket(const char *hostname, const int port, const char *token)
+{
+	if (hostname == nullptr)
+		hostname = "localhost";
+	muri = std::string("ws://") + hostname + ":" + to_string(port) + "/api?token=" + token; /*To be modified*/
+
+	return initialize_websocket();
+}
+
+
 /**
  * Sending ShortCut Icon tapped event
  *
@@ -303,7 +333,7 @@ int LibHomeScreen::onScreenReply(const char* reply_message)
  */
 void LibHomeScreen::set_event_handler(enum EventType et, handler_func f)
 {
-	if (et >= 1 && et <= 7) {
+	if (et > Event_Min && et < Event_Max) {
 		switch (et) {
 			case Event_ShowWindow:
 				this->subscribe(LibHomeScreen::event_list[0]);
@@ -326,6 +356,9 @@ void LibHomeScreen::set_event_handler(enum EventType et, handler_func f)
 			case Event_ShowInformation:
 				this->subscribe(LibHomeScreen::event_list[6]);
 				break;
+			case Event_AppListChanged:
+				this->subscribe(LibHomeScreen::event_list[7]);
+				break;
 		}
 
 		this->handlers[et] = std::move(f);
@@ -597,6 +630,23 @@ int LibHomeScreen::showInformation(json_object* json)
 	return this->call("showInformation", json);
 }
 
+/**
+ * get runnables list
+ *
+ * Call HomeScreen Service's getRunnables verb to get runnalbes list.
+ *
+ * #### Parameters
+ * - Nothing
+ *
+ * #### Return
+ * - Returns 0 on success or -1 in case of error.
+ *
+ */
+int LibHomeScreen::getRunnables(void)
+{
+	return this->call("getRunnables", nullptr);
+}
+
 
 /************* Callback Function *************/
 
@@ -692,6 +742,12 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
 			i->second(json_data);
 		}
 	}
+	else if (strcasecmp(event_type, LibHomeScreen::event_list[7].c_str()) == 0) {
+		auto i = this->handlers.find(Event_AppListChanged);
+		if ( i != this->handlers.end() ) {
+			i->second(json_data);
+		}
+	}
 }
 
 /**