From 7a123d6d802fe76a6d2eb32adacb2215d5bb873a Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Wed, 14 Nov 2018 11:12:44 +0800 Subject: add new features in homescreen-service and homescreen homescreen-service: add five verbs. 1.showWindow: instead of tap_shortcut and show onscreen. 2.hideWindow: used when want to hide onscreen. 3.replyShowWindow: used when post onscreen reply information to application. 4.showNotification: used by application who want to display notification on homescreen top area. 5.showInformation: used by application who want to display information on homescreen botton area. homescreen: 1.add fullscreen transfer button. 2.display notification and information. Bug-AGL: SPEC-1931 Change-Id: I612e541243ee6502eb90ff1aa2ab4d99bfbc7156 Signed-off-by: wang_zhiqiang --- src/hs-client.cpp | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) (limited to 'src/hs-client.cpp') diff --git a/src/hs-client.cpp b/src/hs-client.cpp index 7da2cda..26e43bb 100644 --- a/src/hs-client.cpp +++ b/src/hs-client.cpp @@ -19,6 +19,11 @@ #include "hmi-debug.h" static const char _type[] = "type"; +static const char _text[] = "text"; +static const char _info[] = "info"; +static const char _icon[] = "icon"; +static const char _parameter[] = "parameter"; +static const char _replyto[] = "replyto"; /** * HS_Client construction function @@ -181,3 +186,180 @@ bool HS_Client::checkEvent(const char* event) else return true; } + +/** + * showWindow event + * + * input contents : {"application_id":"the appid that want to display", "parameter":{"area": "display area", ...}} + * + * #### Parameters + * - request : the request + * - appid : the appid that want to display + * + * #### Return + * 0 : success + * others : fail + * + */ +int HS_Client::showWindow(afb_req_t request, const char* appid) +{ + if(!checkEvent(__FUNCTION__)) + return 0; + + HMI_NOTICE("homescreen-service","%s application_id = %s.", __FUNCTION__, appid); + struct json_object* push_obj = json_object_new_object(); + hs_add_object_to_json_object_str( push_obj, 4, _application_id, appid, _type, __FUNCTION__); + const char* param = afb_req_value(request, _parameter); + if(param) { + const char* req_appid = afb_req_get_application_id(request); + struct json_object* param_obj = json_tokener_parse(param); + json_object_object_add(param_obj, _replyto, json_object_new_string(req_appid)); + json_object_object_add(push_obj, _parameter, param_obj); + } + else { + HMI_ERROR("homescreen-service","please input correct parameter."); + return AFB_EVENT_BAD_REQUEST; + } + afb_event_push(my_event, push_obj); + return 0; +} + +/** + * hideWindow event + * + * input contents : {"application_id":"the appid that want to hide"} + * + * #### Parameters + * - request : the request + * + * #### Return + * 0 : success + * others : fail + * + */ +int HS_Client::hideWindow(afb_req_t request) +{ + if(!checkEvent(__FUNCTION__)) + return 0; + + HMI_NOTICE("homescreen-service","%s application_id = %s.", __FUNCTION__); + const char* req_appid = afb_req_get_application_id(request); + struct json_object* push_obj = json_object_new_object(); + hs_add_object_to_json_object_str( push_obj, 4, _application_id, req_appid, + _type, __FUNCTION__); + afb_event_push(my_event, push_obj); + return 0; +} + +/** + * replyShowWindow event + * + * input contens : {"application_id": "the appid that want to reply", "parameter": {...}} + * + * #### Parameters + * - request : the request + * - appid : the appid that want to reply + * + * #### Return + * 0 : success + * others : fail + * + */ +int HS_Client::replyShowWindow(afb_req_t request, const char* appid) +{ + if(!checkEvent(__FUNCTION__)) + return 0; + + HMI_NOTICE("homescreen-service","%s application_id = %s.", __FUNCTION__, appid); + struct json_object* push_obj = json_object_new_object(); + hs_add_object_to_json_object_str( push_obj, 4, _application_id, appid, _type, __FUNCTION__); + const char* param = afb_req_value(request, _parameter); + if(param) { + json_object_object_add(push_obj, _parameter, json_tokener_parse(param)); + } + else { + HMI_ERROR("homescreen-service","please input correct parameter."); + return AFB_EVENT_BAD_REQUEST; + } + + afb_event_push(my_event, push_obj); + return 0; +} + +/** + * showNotification event + * + * input contents : {"icon": "icon path", "text": "message contents"} + * + * #### Parameters + * - request : the request + * + * #### Return + * 0 : success + * others : fail + * + */ +int HS_Client::showNotification(afb_req_t request) +{ + int ret = 0; + const char *value = afb_req_value(request, _text); + if(value) { + HMI_NOTICE("homescreen-service","text is %s", value); + const char* appid = afb_req_get_application_id(request); + struct json_object* param_obj = json_object_new_object(); + const char *icon = afb_req_value(request, _icon); + if(icon) { + json_object_object_add(param_obj, _icon, json_object_new_string(icon)); + json_object_object_add(param_obj, _text, json_object_new_string(value)); + struct json_object* push_obj = json_object_new_object(); + hs_add_object_to_json_object_str( push_obj, 4, _application_id, appid, _type, __FUNCTION__); + json_object_object_add(push_obj, _parameter, param_obj); + afb_event_push(my_event, push_obj); + } + else { + HMI_NOTICE("homescreen-service","please input icon."); + ret = AFB_REQ_SHOWNOTIFICATION_ERROR; + } + } + else { + HMI_NOTICE("homescreen-service","please input text."); + ret = AFB_REQ_SHOWNOTIFICATION_ERROR; + } + + return ret; +} + +/** + * showInformation event + * + * input contents : {"info": "information contents"} + * + * #### Parameters + * - request : the request + * + * #### Return + * 0 : success + * others : fail + * + */ +int HS_Client::showInformation(afb_req_t request) +{ + int ret = 0; + const char *value = afb_req_value(request, _info); + if(value) { + HMI_NOTICE("homescreen-service","info is %s", value); + const char* appid = afb_req_get_application_id(request); + struct json_object* param_obj = json_object_new_object(); + json_object_object_add(param_obj, _info, json_object_new_string(value)); + struct json_object* push_obj = json_object_new_object(); + hs_add_object_to_json_object_str( push_obj, 4, _application_id, appid, _type, __FUNCTION__); + json_object_object_add(push_obj, _parameter, param_obj); + afb_event_push(my_event, push_obj); + } + else { + HMI_NOTICE("homescreen-service","please input information."); + ret = AFB_REQ_SHOWINFORMATION_ERROR; + } + + return ret; +} -- cgit 1.2.3-korg