From c1ba5e531c3b104a3618b84bd711079b469ed76f Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Fri, 22 Jun 2018 16:24:59 +0900 Subject: Modify file name from app.db to drawing_name.db Change-Id: Idbe7bc37c549c759a74559cffdd6b5c2d1a1e11b Signed-off-by: Yuta Doi --- src/CMakeLists.txt | 2 +- src/app.cpp | 48 ++++++++++++++++++++----------- src/app.hpp | 7 +---- src/db/app.db | 76 -------------------------------------------------- src/db/drawing_name.db | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+), 99 deletions(-) delete mode 100644 src/db/app.db create mode 100644 src/db/drawing_name.db diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0819305..fe2f69a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,7 +130,7 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/layout_manager/db/area.db ${PROJECT_BINARY_DIR}/package/root/etc COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/layout.db ${PROJECT_BINARY_DIR}/package/root/etc COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/role.db ${PROJECT_BINARY_DIR}/package/root/etc - COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/app.db ${PROJECT_BINARY_DIR}/package/root/etc + COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/drawing_name.db ${PROJECT_BINARY_DIR}/package/root/etc COMMAND cp -f ${PROJECT_BINARY_DIR}/src/policy_manager/libpolicy_manager.so ${PROJECT_BINARY_DIR}/package/root/lib ) diff --git a/src/app.cpp b/src/app.cpp index fedd227..d7ec53d 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -342,7 +342,7 @@ int App::init() { // TODO: This process is necessary for checking right of requested role. // If other module check it, this process will be removed. // Load app.db - this->loadAppDb(); + this->loadDrawingNameDb(); // Initialize PolicyManager this->pm.initialize(); @@ -1050,8 +1050,8 @@ void App::setAccelPedalPos(double val) { this->crr_car_info.accel_pedal_pos = val; } -extern const char* kDefaultAppDb; -int App::loadAppDb() { +extern const char* kDefaultDrawingNameDb; +int App::loadDrawingNameDb() { HMI_DEBUG("wm", "Call"); // Get afm application installed dir @@ -1063,22 +1063,22 @@ int App::loadAppDb() { HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); } else { - file_name = std::string(afm_app_install_dir) + std::string("/etc/app.db"); + file_name = std::string(afm_app_install_dir) + std::string("/etc/drawing_name.db"); } - // Load app.db + // Load drawing_name.db json_object* json_obj; int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj); if (0 > ret) { - HMI_ERROR("wm", "Could not open app.db, so use default role information"); - json_obj = json_tokener_parse(kDefaultAppDb); + HMI_ERROR("wm", "Could not open drawing_name.db, so use default drawing_name information"); + json_obj = json_tokener_parse(kDefaultDrawingNameDb); } HMI_DEBUG("wm", "json_obj dump:%s", json_object_get_string(json_obj)); // Perse apps - HMI_DEBUG("wm", "Perse apps"); + HMI_DEBUG("wm", "Perse drawing_names"); json_object* json_cfg; - if (!json_object_object_get_ex(json_obj, "apps", &json_cfg)) { + if (!json_object_object_get_ex(json_obj, "drawing_names", &json_cfg)) { HMI_ERROR("wm", "Parse Error!!"); return -1; } @@ -1091,12 +1091,12 @@ int App::loadAppDb() { json_object* json_tmp = json_object_array_get_idx(json_cfg, i); HMI_DEBUG("wm", "> json_tmp dump:%s", json_object_get_string(json_tmp)); - const char* app = jh::getStringFromJson(json_tmp, "name"); - if (nullptr == app) { + const char* drawing_name = jh::getStringFromJson(json_tmp, "name"); + if (nullptr == drawing_name) { HMI_ERROR("wm", "Parse Error!!"); return -1; } - HMI_DEBUG("wm", "> app:%s", app); + HMI_DEBUG("wm", "> drawing_name:%s", drawing_name); const char* role = jh::getStringFromJson(json_tmp, "role"); if (nullptr == role) { @@ -1105,13 +1105,13 @@ int App::loadAppDb() { } HMI_DEBUG("wm", "> role:%s", role); - this->drawingname2role[app] = std::string(role); + this->drawingname2role[drawing_name] = std::string(role); } // Check for(auto itr = this->drawingname2role.begin(); itr != this->drawingname2role.end(); ++itr) { - HMI_DEBUG("wm", "app:%s role:%s", + HMI_DEBUG("wm", "drawing_name:%s role:%s", itr->first.c_str(), itr->second.c_str()); } @@ -1122,8 +1122,8 @@ int App::loadAppDb() { } -const char* kDefaultAppDb = "{ \ - \"apps\": [ \ +const char* kDefaultDrawingNameDb = "{ \ + \"drawing_names\": [ \ { \ \"name\": \"HomeScreen\", \ \"role\": \"homescreen\" \ @@ -1179,6 +1179,22 @@ const char* kDefaultAppDb = "{ \ { \ \"name\": \"Mixer\", \ \"role\": \"mixer\" \ + }, \ + { \ + \"name\": \"Splitable1\", \ + \"role\": \"splitable1\" \ + }, \ + { \ + \"name\": \"Splitable2\", \ + \"role\": \"splitable2\" \ + }, \ + { \ + \"name\": \"Restriction\", \ + \"role\": \"restriction\" \ + }, \ + { \ + \"name\": \"^OnScreen.*\", \ + \"role\": \"pop_up\" \ } \ ] \ }"; diff --git a/src/app.hpp b/src/app.hpp index 3fc5738..abe663f 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -264,14 +264,9 @@ private: void updateCarElements(json_object* json_out); void updateLayers(json_object* json_out); void setSurfaceSize(const char* role, const char* area); - int loadAppDb(); + int loadDrawingNameDb(); const char* convertDrawingNameToRole(char const *drawing_name); -#if 0 - struct id_allocator app_id_alloc; - std::unordered_map appname2appid; -#endif - optional lookup_id(char const *name); optional lookup_name(int id); diff --git a/src/db/app.db b/src/db/app.db deleted file mode 100644 index f1f937b..0000000 --- a/src/db/app.db +++ /dev/null @@ -1,76 +0,0 @@ -{ - "apps": [ - { - "name": "HomeScreen", - "role": "homescreen" - }, - { - "name": "Music", - "role": "music" - }, - { - "name": "MediaPlayer", - "role": "music" - }, - { - "name": "Video", - "role": "video" - }, - { - "name": "VideoPlayer", - "role": "video" - }, - { - "name": "WebBrowser", - "role": "browser" - }, - { - "name": "Radio", - "role": "radio" - }, - { - "name": "Phone", - "role": "phone" - }, - { - "name": "Navigation", - "role": "map" - }, - { - "name": "HVAC", - "role": "hvac" - }, - { - "name": "Settings", - "role": "settings" - }, - { - "name": "Dashboard", - "role": "dashboard" - }, - { - "name": "POI", - "role": "poi" - }, - { - "name": "Mixer", - "role": "mixer" - }, - { - "name": "Splitable1", - "role": "splitable1" - }, - { - "name": "Splitable2", - "role": "splitable2" - }, - { - "name": "Restriction", - "role": "restriction" - }, - { - "name": "^OnScreen.*", - "role": "pop_up" - } - ] -} diff --git a/src/db/drawing_name.db b/src/db/drawing_name.db new file mode 100644 index 0000000..c30fa34 --- /dev/null +++ b/src/db/drawing_name.db @@ -0,0 +1,76 @@ +{ + "drawing_names": [ + { + "name": "HomeScreen", + "role": "homescreen" + }, + { + "name": "Music", + "role": "music" + }, + { + "name": "MediaPlayer", + "role": "music" + }, + { + "name": "Video", + "role": "video" + }, + { + "name": "VideoPlayer", + "role": "video" + }, + { + "name": "WebBrowser", + "role": "browser" + }, + { + "name": "Radio", + "role": "radio" + }, + { + "name": "Phone", + "role": "phone" + }, + { + "name": "Navigation", + "role": "map" + }, + { + "name": "HVAC", + "role": "hvac" + }, + { + "name": "Settings", + "role": "settings" + }, + { + "name": "Dashboard", + "role": "dashboard" + }, + { + "name": "POI", + "role": "poi" + }, + { + "name": "Mixer", + "role": "mixer" + }, + { + "name": "Splitable1", + "role": "splitable1" + }, + { + "name": "Splitable2", + "role": "splitable2" + }, + { + "name": "Restriction", + "role": "restriction" + }, + { + "name": "^OnScreen.*", + "role": "pop_up" + } + ] +} -- cgit 1.2.3-korg