Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add calling callback for onError
[apps/agl-service-windowmanager.git]
/
src
/
app.cpp
diff --git
a/src/app.cpp
b/src/app.cpp
index
7d2f121
..
05f8b64
100644
(file)
--- a/
src/app.cpp
+++ b/
src/app.cpp
@@
-95,12
+95,18
@@
struct result<layer_map> load_layer_map(char const *filename) {
namespace rm {
App *context;
namespace rm {
App *context;
-static void eventHandler(json_object* json_out) {
- context->updateWindowResource(json_out);
+static void onStateTransitioned(json_object* json_out) {
+ context->updateWindowResources(json_out);
+}
+
+static void onError(json_object* json_out) {
+ HMI_DEBUG("wm", "error message from PolicyManager:%s",
+ json_object_get_string(json_out));
}
} // namespace rm
}
} // namespace rm
-void App::updateWindowResource(json_object* json_out) {
+
+void App::updateCarStates(json_object* json_out) {
// Check parking brake state
json_object* json_parking_brake;
if (!json_object_object_get_ex(json_out, "parking_brake", &json_parking_brake)) {
// Check parking brake state
json_object* json_parking_brake;
if (!json_object_object_get_ex(json_out, "parking_brake", &json_parking_brake)) {
@@
-238,7
+244,9
@@
void App::updateWindowResource(json_object* json_out) {
return;
}
}
return;
}
}
+}
+void App::updateLayers(json_object* json_out) {
// Get displayed roles from current layout
json_object* json_layers;
if (!json_object_object_get_ex(json_out, "layers", &json_layers)) {
// Get displayed roles from current layout
json_object* json_layers;
if (!json_object_object_get_ex(json_out, "layers", &json_layers)) {
@@
-320,6
+328,13
@@
void App::updateWindowResource(json_object* json_out) {
}
}
}
}
+void App::updateWindowResources(json_object* json_out) {
+ // Update car states
+ this->updateCarStates(json_out);
+
+ // Update layers
+ this->updateLayers(json_out);
+}
/**
* App Impl
/**
* App Impl
@@
-379,8
+394,8
@@
int App::init() {
// Register callback to PolicyManager
PolicyManager::CallbackTable callback;
// Register callback to PolicyManager
PolicyManager::CallbackTable callback;
- callback.onStateTransitioned = rm::
eventHandler
;
- callback.onError =
nullpt
r;
+ callback.onStateTransitioned = rm::
onStateTransitioned
;
+ callback.onError =
rm::onErro
r;
this->pm_.registerCallback(callback);
// Initialize LayoutManager
this->pm_.registerCallback(callback);
// Initialize LayoutManager