From 9955dd5854eb63fe9d5d81c4ece555c4ad570cae Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 24 Apr 2024 16:50:16 +0200 Subject: [PATCH] added libraries and attempted to call class in mainactivity --- .../Fitbot/.idea/deploymentTargetDropDown.xml | 17 ------------- .../java/com/example/fitbot/MainActivity.java | 13 ++++++++++ .../java/com/example/fitbot/bicepvideo.java | 24 ++++++++++++++++++- 3 files changed, 36 insertions(+), 18 deletions(-) delete mode 100644 code/src/Fitbot/.idea/deploymentTargetDropDown.xml diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 24e256e..0000000 --- a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file 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 10bca80..21b7f5c 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 @@ -1,14 +1,19 @@ package com.example.fitbot; +import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import com.aldebaran.qi.sdk.QiContext; import com.aldebaran.qi.sdk.QiSDK; import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; +import com.aldebaran.qi.sdk.builder.AnimateBuilder; +import com.aldebaran.qi.sdk.builder.AnimationBuilder; import com.aldebaran.qi.sdk.builder.SayBuilder; import com.aldebaran.qi.sdk.design.activity.RobotActivity; import com.aldebaran.qi.sdk.design.activity.conversationstatus.SpeechBarDisplayStrategy; +import com.aldebaran.qi.sdk.object.actuation.Animate; +import com.aldebaran.qi.sdk.object.actuation.Animation; import com.aldebaran.qi.sdk.object.conversation.Phrase; import com.aldebaran.qi.sdk.object.conversation.Say; import com.aldebaran.qi.sdk.object.locale.Language; @@ -52,8 +57,16 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac sayName.run(); sayDescription.run(); + + // Create a new BicepVideo with the qiContext + bicepvideo BicepVideo = new bicepvideo(); + + // Call the videoPlayer method + BicepVideo.Video(qiContext); + } + @Override public void onRobotFocusLost() { // Nothing here. diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/bicepvideo.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/bicepvideo.java index c0b252e..bf5c167 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/bicepvideo.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/bicepvideo.java @@ -9,13 +9,24 @@ import android.widget.Button; import android.widget.MediaController; import android.widget.VideoView; +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.builder.AnimateBuilder; +import com.aldebaran.qi.sdk.builder.AnimationBuilder; +import com.aldebaran.qi.sdk.object.actuation.Animate; +import com.aldebaran.qi.sdk.object.actuation.Animation; + public class bicepvideo extends AppCompatActivity { + private QiContext qiContext; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_bicepvideo); + } + + public void Video(QiContext qiContext) { VideoView videoView = findViewById(R.id.videoView); videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo)); @@ -36,7 +47,18 @@ public class bicepvideo extends AppCompatActivity { videoView.start(); // Restart video on completion } }); - videoView.start(); + + Animation animation = AnimationBuilder.with(qiContext) + .withResources(R.raw.bicepcurl) + .build(); + + Animate animate = AnimateBuilder.with(qiContext) + .withAnimation(animation) + .build(); + + + animate.async().run(); + } } \ No newline at end of file