Compare commits

...

1 Commits

Author SHA1 Message Date
Luca Warmenhoven
396403fd85 Updated motion processing and WebSocket code. 2024-05-14 12:55:06 +02:00
6 changed files with 56 additions and 32 deletions

View File

@@ -1,6 +1,7 @@
package com.example.fitbot; package com.example.fitbot;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiContext;
import com.aldebaran.qi.sdk.builder.AnimateBuilder; import com.aldebaran.qi.sdk.builder.AnimateBuilder;
import com.aldebaran.qi.sdk.builder.AnimationBuilder; import com.aldebaran.qi.sdk.builder.AnimationBuilder;

View File

@@ -1,7 +1,7 @@
package com.example.fitbot; package com.example.fitbot;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
public class Completion_Screen extends AppCompatActivity { public class Completion_Screen extends AppCompatActivity {

View File

@@ -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.Language;
import com.aldebaran.qi.sdk.object.locale.Locale; import com.aldebaran.qi.sdk.object.locale.Locale;
import com.aldebaran.qi.sdk.object.locale.Region; import com.aldebaran.qi.sdk.object.locale.Region;
//import com.example.fitbot.ui.SportMenuActivity;
public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks { public class MainActivity extends RobotActivity implements RobotLifecycleCallbacks {
@@ -21,6 +22,7 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac
// Register the RobotLifecycleCallbacks to this Activity. // Register the RobotLifecycleCallbacks to this Activity.
QiSDK.register(this, this); QiSDK.register(this, this);
} }
@Override @Override

View File

@@ -1,6 +1,7 @@
package com.example.fitbot; package com.example.fitbot;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat; 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.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; 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.ui.SportMenuActivity;
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;
public class MainScreen extends AppCompatActivity { public class MainScreen extends AppCompatActivity {
@@ -37,28 +31,6 @@ public class MainScreen extends AppCompatActivity {
navigationView = findViewById(R.id.nav_view); navigationView = findViewById(R.id.nav_view);
toolbar = findViewById(R.id.toolbar); 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<Vector3> relativePath = new ArrayList<>();
double y, dy;
Function<Double, Double> F = (x) -> 4.0 + 0.125D * x * x;
Function<Double, Double> 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---*/ /*---Tool Bar---*/
// setSupportActionBar(toolbar); // setSupportActionBar(toolbar);

View File

@@ -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) {
}
}

View File

@@ -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
}
}