Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crashing errors

Browse Source
This commit is contained in:
Niels Gras
2024-05-22 14:47:01 +02:00
parent bc8763927b
commit 60fa1cec2c
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
View File

@@ -1,21 +1,17 @@
package com.example.fitbot.ui.activities; package com.example.fitbot.ui.activities;
import android.content.Context; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.View; import android.widget.MediaController;
import android.widget.VideoView;
import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiContext;
import com.aldebaran.qi.sdk.QiSDK; import com.aldebaran.qi.sdk.QiSDK;
import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.aldebaran.qi.sdk.RobotLifecycleCallbacks;
import com.aldebaran.qi.sdk.design.activity.RobotActivity; import com.aldebaran.qi.sdk.design.activity.RobotActivity;
import com.example.fitbot.ui.activities.EndScreenActivity;
import com.example.fitbot.R; import com.example.fitbot.R;
import com.example.fitbot.sports.Animations; import com.example.fitbot.sports.Animations;
import com.example.fitbot.R;
import com.example.fitbot.exercise.Exercise;
import com.example.fitbot.exercise.EMuscleGroup;
import com.example.fitbot.ui.components.PersonalMotionPreviewElement; import com.example.fitbot.ui.components.PersonalMotionPreviewElement;
import com.example.fitbot.util.path.GesturePath; import com.example.fitbot.util.path.GesturePath;
@@ -23,13 +19,31 @@ import org.joml.Vector3f;
public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks { public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks {
PersonalMotionPreviewElement personalMotionPreviewElement; // PersonalMotionPreviewElement personalMotionPreviewElement;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// Set the content view to the appropriate layout
setContentView(R.layout.activity_fitness); setContentView(R.layout.activity_fitness);
// Find the VideoView by its ID
VideoView videoView = findViewById(R.id.videoView);
if (videoView != null) {
videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo));
MediaController mediaController = new MediaController(this);
videoView.setMediaController(mediaController);
videoView.start();
} else {
Log.e("FitnessActivity", "VideoView is null. Check your layout XML.");
}
com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.buttonComplete, EndScreenActivity.class);
GesturePath.Builder gesturePathBuilder = new GesturePath.Builder(); GesturePath.Builder gesturePathBuilder = new GesturePath.Builder();
gesturePathBuilder.addVector(new Vector3f(-.5f, -.5f, -.5f)); gesturePathBuilder.addVector(new Vector3f(-.5f, -.5f, -.5f));
@@ -44,22 +58,21 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
gesturePathBuilder.addVector(new Vector3f(-.5f, .5f, .5f)); gesturePathBuilder.addVector(new Vector3f(-.5f, .5f, .5f));
gesturePathBuilder.addVector(new Vector3f(-.5f, .5f, -.5f)); gesturePathBuilder.addVector(new Vector3f(-.5f, .5f, -.5f));
// Uncomment and fix if needed for personalMotionPreviewElement
personalMotionPreviewElement = findViewById(R.id.personalMotionPreviewElement); // personalMotionPreviewElement = findViewById(R.id.personalMotionPreviewElement);
personalMotionPreviewElement.post(() -> { // personalMotionPreviewElement.post(() -> {
Log.i("FitnessActivity", "PersonalMotionPreviewElement.post()"); // Log.i("FitnessActivity", "PersonalMotionPreviewElement.post()");
//
Exercise exercise = new Exercise(EMuscleGroup.ARMS, "Bicep Curls", "Oefening voor de biceps.", gesturePathBuilder.build(), 1); // Exercise exercise = new Exercise(EMuscleGroup.ARMS, "Bicep Curls", "Oefening voor de biceps.", gesturePathBuilder.build(), 1);
//
personalMotionPreviewElement.initialize(exercise); // personalMotionPreviewElement.initialize(exercise);
}); // });
} }
@Override @Override
public void onRobotFocusGained(QiContext qiContext) { public void onRobotFocusGained(QiContext qiContext) {
// Implement your logic when the robot focus is gained // Implement your logic when the robot focus is gained
Animations.Animate("bicepcurl", qiContext); Animations.Animate("bicepcurl", qiContext);
} }
@Override @Override
@@ -75,7 +88,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
@Override @Override
protected void onDestroy() { protected void onDestroy() {
QiSDK.unregister(this, this); QiSDK.unregister(this, this);
super.onDestroy(); super.onDestroy();
} }
} }