start launcher and lastmode after homescreen started

[apps/agl-service-homescreen.git] / src / hs-config.cpp

diff --git a/src/hs-config.cpp b/src/hs-config.cpp
index b8f9f5b..df45e42 100644 (file)
--- a/src/hs-config.cpp
+++ b/src/hs-config.cpp
@@ -22,6 +22,11 @@ const std::array<std::string, 3> HS_Config::keys_recover_type = {   // based on
     "default-lastmode",
     "normal-apps"
 };
+const std::string HS_Config::lastmode_json = "lastmode.json";
+const std::string HS_Config::key_appid = "appid";
+const std::string HS_Config::key_visibility = "visibility";
+const std::string HS_Config::key_after = "after";
+std::string HS_Config::root_dir = "";
 
 /**
  * read configuration file to memory
@@ -35,14 +40,14 @@ const std::array<std::string, 3> HS_Config::keys_recover_type = {   // based on
  */
 int HS_Config::readConfig(void)
 {
-    auto rootdir = std::string(getenv("AFM_APP_INSTALL_DIR"));
-    auto path = rootdir + "/etc/" + hs_conf_json;
+    root_dir = std::string(getenv("AFM_APP_INSTALL_DIR"));
+    auto path = root_dir + "/etc/" + hs_conf_json;
     if(readJsonFile(path.c_str(), &m_hs_conf) < 0) {
         AFB_ERROR("read %s failed.", hs_conf_json.c_str());
         return -1;
     }
 
-    path = rootdir + "/etc/" + lastmode_json;
+    path = root_dir + "/etc/" + lastmode_json;
     if(readJsonFile(path.c_str(), &m_lastmode) < 0) {
         AFB_ERROR("read %s failed.", lastmode_json.c_str());
         m_lastmode = nullptr;
@@ -141,6 +146,12 @@ std::vector<struct recover_app_info> HS_Config::getRecoverAppInfo(struct json_ob
         else {
             info.visibility = false;
         }
+        if(json_object_object_get_ex(info_obj, key_after.c_str(), &value_obj)) {
+            info.after = json_object_get_string(value_obj);
+        }
+        else {
+            info.after.clear();
+        }
         v_app_info.push_back(info);
     }