diff options
Diffstat (limited to 'src/layout_manager/layout.cpp')
| -rw-r--r-- | src/layout_manager/layout.cpp | 158 |
1 files changed, 47 insertions, 111 deletions
diff --git a/src/layout_manager/layout.cpp b/src/layout_manager/layout.cpp index a3952c4..2fcc07a 100644 --- a/src/layout_manager/layout.cpp +++ b/src/layout_manager/layout.cpp @@ -30,8 +30,8 @@ int LayoutManager::initialize() { int ret = 0; - // Load layout.db - ret = this->loadLayoutDb(); + // Load area.db + ret = this->loadAreaDb(); if (0 > ret) { HMI_ERROR("wm:lm", "Load layout.db Error!!"); return ret; @@ -44,8 +44,8 @@ compositor::rect LayoutManager::getAreaSize(const char* area) { return this->area2size[area]; } -extern const char* kDefaultLayoutDb; -int LayoutManager::loadLayoutDb() { +extern const char* kDefaultAreaDb; +int LayoutManager::loadAreaDb() { HMI_DEBUG("wm:lm", "Call"); // Get afm application installed dir @@ -57,15 +57,15 @@ int LayoutManager::loadLayoutDb() { HMI_ERROR("wm:lm", "AFM_APP_INSTALL_DIR is not defined"); } else { - file_name = std::string(afm_app_install_dir) + std::string("/etc/layout.db"); + file_name = std::string(afm_app_install_dir) + std::string("/etc/area.db"); } - // Load layout.db + // Load area.db json_object* json_obj; int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj); if (0 > ret) { - HMI_DEBUG("wm:lm", "Could not open layout.db, so use default layout information"); - json_obj = json_tokener_parse(kDefaultLayoutDb); + HMI_DEBUG("wm:lm", "Could not open area.db, so use default area information"); + json_obj = json_tokener_parse(kDefaultAreaDb); } HMI_DEBUG("wm:lm", "json_obj dump:%s", json_object_get_string(json_obj)); @@ -123,109 +123,18 @@ int LayoutManager::loadLayoutDb() { return 0; } -const char* kDefaultLayoutDb = "{ \ - \"layouts\": [ \ - { \ - \"name\": \"pu\", \ - \"layer\": \"on_screen\", \ - \"areas\": [ \ - { \ - \"name\": \"pop_up\", \ - \"role\": \"incomming_call\" \ - } \ - ] \ - }, \ - { \ - \"name\": \"sa\", \ - \"layer\": \"on_screen\", \ - \"areas\": [ \ - { \ - \"name\": \"system_alert\", \ - \"role\": \"system_alert\" \ - } \ - ] \ - }, \ - { \ - \"name\": \"m1\", \ - \"layer\": \"apps\", \ - \"areas\": [ \ - { \ - \"name\": \"normal\", \ - \"role\": \"map\" \ - } \ - ] \ - }, \ - { \ - \"name\": \"m2\", \ - \"layer\": \"apps\", \ - \"areas\": [ \ - { \ - \"name\": \"split.main\", \ - \"role\": \"map\" \ - }, \ - { \ - \"name\": \"split.sub\", \ - \"category\": \"hvac\" \ - } \ - ] \ - }, \ - { \ - \"name\": \"mf\", \ - \"layer\": \"apps\", \ - \"areas\": [ \ - { \ - \"name\": \"full\", \ - \"role\": \"map\" \ - } \ - ] \ - }, \ - { \ - \"name\": \"s1\", \ - \"layer\": \"apps\", \ - \"areas\": [ \ - { \ - \"name\": \"normal\", \ - \"category\": \"splitable\" \ - } \ - ] \ - }, \ - { \ - \"name\": \"s2\", \ - \"layer\": \"apps\", \ - \"areas\": [ \ - { \ - \"name\": \"split.main\", \ - \"category\": \"splitable\" \ - }, \ - { \ - \"name\": \"split.sub\", \ - \"category\": \"splitable\" \ - } \ - ] \ - }, \ +const char* kDefaultAreaDb = "{ \ + \"areas\": [ \ { \ - \"name\": \"g\", \ - \"layer\": \"apps\", \ - \"areas\": [ \ - { \ - \"name\": \"normal\", \ - \"category\": \"general\" \ - } \ - ] \ + \"name\": \"fullscreen\", \ + \"rect\": { \ + \"x\": 0, \ + \"y\": 0, \ + \"w\": 1080, \ + \"h\": 1920 \ + } \ }, \ { \ - \"name\": \"hs\", \ - \"layer\": \"homescreen\", \ - \"areas\": [ \ - { \ - \"name\": \"full\", \ - \"role\": \"homescreen\" \ - } \ - ] \ - } \ - ], \ - \"areas\": [ \ - { \ \"name\": \"normal\", \ \"rect\": { \ \"x\": 0, \ @@ -253,12 +162,39 @@ const char* kDefaultLayoutDb = "{ \ } \ }, \ { \ - \"name\": \"full\", \ + \"name\": \"software_keyboard\", \ \"rect\": { \ \"x\": 0, \ - \"y\": 0, \ + \"y\": 962, \ \"w\": 1080, \ - \"h\": 1920 \ + \"h\": 744 \ + } \ + }, \ + { \ + \"name\": \"restriction.normal\", \ + \"rect\": { \ + \"x\": 0, \ + \"y\": 218, \ + \"w\": 1080, \ + \"h\": 1488 \ + } \ + }, \ + { \ + \"name\": \"restriction.split.main\", \ + \"rect\": { \ + \"x\": 0, \ + \"y\": 218, \ + \"w\": 1080, \ + \"h\": 744 \ + } \ + }, \ + { \ + \"name\": \"restriction.split.sub\", \ + \"rect\": { \ + \"x\": 0, \ + \"y\": 962, \ + \"w\": 1080, \ + \"h\": 744 \ } \ }, \ { \ |