this->prv_layers_["on_screen"] = layout;
this->prv_layers_["apps"] = layout;
this->prv_layers_["homescreen"] = layout;
+ this->prv_layers_["restriction"] = layout;
this->crr_layers_["on_screen"] = layout;
this->crr_layers_["apps"] = layout;
this->crr_layers_["homescreen"] = layout;
+ this->crr_layers_["restriction"] = layout;
this->prv_layers_car_stop_["on_screen"] = layout;
this->prv_layers_car_stop_["apps"] = layout;
this->prv_layers_car_stop_["homescreen"] = layout;
+ this->prv_layers_car_stop_["restriction"] = layout;
return ret;
}
json_object_object_foreach(json_tmp, key, val) {
layer = key;
json_layer = val;
- HMI_DEBUG("wm:lm", "Update %s layer state", layer);
+ HMI_DEBUG("wm:lm", "Try to update %s layer state", layer);
}
// Store previous state
crr_layout[crr_layout_name] = this->layout_define_[crr_layout_name];
}
+ // Update role in new area
if (is_car_state_changed) {
// Updating role is not necessary
- // because new_role is not specified when car state is changed
+ // because new_role is not specified
+ // when car state is changed
}
else {
// Get new_area for new role
std::string new_area = this->getAreaName(this->layout_define_[crr_layout_name],
new_role, category);
- // Update role in new area
TypeRolCtg crr_role;
crr_role["role"] = std::string(new_role);
crr_layout[crr_layout_name][new_area] = crr_role;
return this->is_layout_changed_[layer];
}
+
extern const char* kDefaultLayoutDb;
int LayoutManager::loadLayoutDb() {
HMI_DEBUG("wm:lm", "Call");
}
// Load layout.db
- HMI_DEBUG("wm:lm", "file_name:%s", file_name.c_str());
- json_object* json_obj = json_object_from_file(file_name.c_str());
- if (nullptr == json_obj) {
- HMI_ERROR("wm:lm", "Could not open layout.db, so use default role information");
+ 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", "json_obj dump:%s", json_object_get_string(json_obj));