mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-09-30 19:33:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI:shorten variable name (#19633)

Browse Source
This commit is contained in:
Dean Lee
2021-01-04 04:25:24 +08:00
committed by GitHub
parent 75774b817f
commit 0c4e2fadc8
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/android/ui.cc
+7 -7
View File
@@ -70,7 +70,7 @@ static void handle_vision_touch(UIState *s, int touch_x, int touch_y) {
if (s->started && (touch_x >= s->scene.viz_rect.x - bdr_s)
&& (s->active_app != cereal::UiLayoutState::App::SETTINGS)) {
if (!s->scene.frontview) {
s->scene.uilayout_sidebarcollapsed = !s->scene.uilayout_sidebarcollapsed;
s->scene.sidebar_collapsed = !s->scene.sidebar_collapsed;
} else {
Params().write_db_value("IsDriverViewEnabled", "0", 1);
}
@@ -78,13 +78,13 @@ static void handle_vision_touch(UIState *s, int touch_x, int touch_y) {
}
static void handle_sidebar_touch(UIState *s, int touch_x, int touch_y) {
if (!s->scene.uilayout_sidebarcollapsed && touch_x <= sbr_w) {
if (!s->scene.sidebar_collapsed && touch_x <= sbr_w) {
if (settings_btn.ptInRect(touch_x, touch_y)) {
s->active_app = cereal::UiLayoutState::App::SETTINGS;
} else if (home_btn.ptInRect(touch_x, touch_y)) {
if (s->started) {
s->active_app = cereal::UiLayoutState::App::NONE;
s->scene.uilayout_sidebarcollapsed = true;
s->scene.sidebar_collapsed = true;
} else {
s->active_app = cereal::UiLayoutState::App::HOME;
}
@@ -99,14 +99,14 @@ static void update_offroad_layout_state(UIState *s, PubMaster *pm) {
if (timeout > 0) {
timeout--;
}
if (prev_collapsed != s->scene.uilayout_sidebarcollapsed || prev_app != s->active_app || timeout == 0) {
if (prev_collapsed != s->scene.sidebar_collapsed || prev_app != s->active_app || timeout == 0) {
MessageBuilder msg;
auto layout = msg.initEvent().initUiLayoutState();
layout.setActiveApp(s->active_app);
layout.setSidebarCollapsed(s->scene.uilayout_sidebarcollapsed);
layout.setSidebarCollapsed(s->scene.sidebar_collapsed);
pm->send("offroadLayout", msg);
LOGD("setting active app to %d with sidebar %d", (int)s->active_app, s->scene.uilayout_sidebarcollapsed);
prev_collapsed = s->scene.uilayout_sidebarcollapsed;
LOGD("setting active app to %d with sidebar %d", (int)s->active_app, s->scene.sidebar_collapsed);
prev_collapsed = s->scene.sidebar_collapsed;
prev_app = s->active_app;
timeout = 2 * UI_FREQ;
}