FHWS/SensorReadout
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor Logger and add Settings-UI

Browse Source 
- Refactored logger infrastructure, so that sensors have to provide
proper timestamps for the logged data, instead of the Logger generating
a timestamp when it is logged to the file.
- Added a settings UI where active sensors and activities can be
configured
This commit is contained in:
Markus Ebner
2019-08-18 13:42:18 +02:00
parent daa0652e39
commit a0d46c9aae
34 changed files with 663 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
app/src/main/res/layout/activity_main.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -62,8 +63,7 @@
android:background="#64bbe5" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/txtFile"
android:layout_width="match_parent"
@@ -117,189 +117,15 @@
android:textColor="#ffffff" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutActivity1"
<TableLayout
android:id="@+id/pedestrianActivityButtonContainer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/layoutGround"
android:layout_marginEnd="10dip"
android:layout_height="wrap_content"
android:layout_weight="2"/>
android:layout_marginTop="10dip"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="3">
<LinearLayout
android:id="@+id/btnWalk"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_walk" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Laufen" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnStairsUp"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_stairs_up" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Treppe rauf" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnStairsDown"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_stairs_down" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Treppe runter" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/layoutActivity2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/layoutGround"
android:layout_marginEnd="10dip"
android:layout_marginTop="10dip"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="3">
<LinearLayout
android:id="@+id/btnStanding"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_standing" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Stehen" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnElevatorUp"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_elevator_up" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Aufzug rauf" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnElevatorDown"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_elevator_down" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Aufzug runter" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/layoutGround"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -309,9 +135,17 @@
<Button
android:id="@+id/btnGround"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#64bbe5"
android:text="Ground Truth" />
</RelativeLayout>
<Button
android:id="@+id/btnSettings"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="#bbb"
android:text="Settings" />
</LinearLayout>
</LinearLayout>