From 396403fd85a64859762d97a7b35cc26962755202 Mon Sep 17 00:00:00 2001 From: Luca Warmenhoven Date: Tue, 14 May 2024 12:55:06 +0200 Subject: [PATCH] Updated motion processing and WebSocket code. --- .../java/com/example/fitbot/Animations.java | 1 + .../com/example/fitbot/Completion_Screen.java | 2 +- .../java/com/example/fitbot/MainActivity.java | 2 ++ .../java/com/example/fitbot/MainScreen.java | 34 ++----------------- .../fitbot/ui/SportPreviewActivity.java | 27 +++++++++++++++ .../ui/components/SportPreviewCanvas.java | 22 ++++++++++++ 6 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java create mode 100644 code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java index 33a3e3e..3bfff8a 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Animations.java @@ -1,6 +1,7 @@ package com.example.fitbot; import android.support.v7.app.AppCompatActivity; + import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.builder.AnimateBuilder; import com.aldebaran.qi.sdk.builder.AnimationBuilder; diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java index 092c65a..55dd036 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/Completion_Screen.java @@ -1,7 +1,7 @@ package com.example.fitbot; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; public class Completion_Screen extends AppCompatActivity { diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java index 4a77e68..9ebdb80 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java @@ -12,6 +12,7 @@ import com.aldebaran.qi.sdk.object.conversation.Say; import com.aldebaran.qi.sdk.object.locale.Language; import com.aldebaran.qi.sdk.object.locale.Locale; import com.aldebaran.qi.sdk.object.locale.Region; +//import com.example.fitbot.ui.SportMenuActivity; public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks { @@ -21,6 +22,7 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac // Register the RobotLifecycleCallbacks to this Activity. QiSDK.register(this, this); + } @Override diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java index 958aeb8..f262998 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java @@ -1,6 +1,7 @@ package com.example.fitbot; import android.annotation.SuppressLint; +import android.content.Intent; import android.os.Bundle; import android.support.design.widget.NavigationView; import android.support.v4.view.GravityCompat; @@ -8,16 +9,9 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.util.Log; +import android.widget.Button; -import com.example.fitbot.util.processing.GesturePath; -import com.example.fitbot.util.processing.MotionData; -import com.example.fitbot.util.processing.MotionProcessor; -import com.example.fitbot.util.processing.Vector3; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; +//import com.example.fitbot.ui.SportMenuActivity; public class MainScreen extends AppCompatActivity { @@ -37,28 +31,6 @@ public class MainScreen extends AppCompatActivity { navigationView = findViewById(R.id.nav_view); toolbar = findViewById(R.id.toolbar); - MotionProcessor motionProcessor = new MotionProcessor(); - GesturePath.Builder builder = new GesturePath.Builder(); - - motionProcessor.setMotionDataEventHandler((data -> { - Log.i("MotionProcessor", "Current position: " + data.toString()); - })); - - List relativePath = new ArrayList<>(); - - double y, dy; - - Function F = (x) -> 4.0 + 0.125D * x * x; - Function d2F = (x) -> 0.25D; - - for ( double x = -50; x < 10; x += 0.125D ) { - - builder.addVector(new Vector3(0, F.apply(x), 0)); - motionProcessor.addMotionData(new MotionData(new Vector3(0, d2F.apply(x), 0), Vector3.zero())); - } - - motionProcessor.logStatistics(builder.build()); - /*---Tool Bar---*/ // setSupportActionBar(toolbar); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java new file mode 100644 index 0000000..9557bce --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/SportPreviewActivity.java @@ -0,0 +1,27 @@ +package com.example.fitbot.ui; + +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; +import com.aldebaran.qi.sdk.design.activity.RobotActivity; + +public class SportPreviewActivity extends RobotActivity implements RobotLifecycleCallbacks { + + + @Override + public void onRobotFocusGained(QiContext qiContext) { + + } + + @Override + + + @Override + public void onRobotFocusLost() { + + } + + @Override + public void onRobotFocusRefused(String reason) { + + } +} diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java new file mode 100644 index 0000000..86b7cda --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/SportPreviewCanvas.java @@ -0,0 +1,22 @@ +package com.example.fitbot.ui.components; + +import android.content.Context; +import android.graphics.Canvas; +import android.view.View; + +public class SportPreviewCanvas extends View { + + + private void calculatePath + + + public SportPreviewCanvas(Context context, GesturePath path) { + super(context); + } + + @Override + public void onDraw(Canvas canvas) { + // Draw the sport preview canvas + + } +}