Fixed crashing errors
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
package com.example.fitbot.ui.activities;
|
||||
|
||||
import android.net.Uri;
|
||||
import static com.example.fitbot.sports.Animations.Animate;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.MediaController;
|
||||
import android.widget.VideoView;
|
||||
|
||||
@@ -20,6 +23,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_fitness);
|
||||
|
||||
VideoView videoView = findViewById(R.id.videoView);
|
||||
videoView.setVideoURI(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo));
|
||||
@@ -28,15 +32,15 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
videoView.setMediaController(mediaController);
|
||||
videoView.start();
|
||||
|
||||
com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
|
||||
com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.buttonComplete, EndScreenActivity.class);
|
||||
}
|
||||
|
||||
|
||||
QiSDK.register(this, this);
|
||||
|
||||
com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.homeButton, MainActivity.class);
|
||||
com.example.fitbot.util.ButtonNavigation.setupButtonNavigation(this, R.id.buttonComplete, EndScreenActivity.class);
|
||||
}
|
||||
|
||||
|
||||
// QiSDK.register(this, this);
|
||||
//
|
||||
//
|
||||
|
||||
@Override
|
||||
public void onRobotFocusGained(QiContext qiContext) {
|
||||
// Implement your logic when the robot focus is gained
|
||||
@@ -60,5 +64,12 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall
|
||||
|
||||
super.onDestroy();
|
||||
}
|
||||
}
|
||||
public static class PersonalMotionPreviewElement extends View {
|
||||
|
||||
public PersonalMotionPreviewElement(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
// Initialize your custom view here (optional)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@@ -1,11 +1,13 @@
|
||||
package com.example.fitbot.ui.activities;
|
||||
|
||||
import static com.example.fitbot.sports.Animations.Animate;
|
||||
|
||||
import android.Manifest;
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Intent;
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.design.widget.NavigationView;
|
||||
import android.support.v4.app.ActivityCompat;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
@@ -16,16 +18,9 @@ import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.util.Log;
|
||||
import android.widget.Button;
|
||||
import android.Manifest;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
|
||||
import com.example.fitbot.bluetooth.BluetoothDevice;
|
||||
import com.example.fitbot.wiiboard.WiiBoard;
|
||||
import com.example.fitbot.wiiboard.WiiBoardDiscoverer;
|
||||
import com.example.fitbot.wiiboard.WiiBoardDiscoveryListener;
|
||||
import com.example.fitbot.R;
|
||||
import com.example.fitbot.wiiboard.WiiBoardDiscoverer;
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
@@ -39,10 +34,20 @@ public class MainActivity extends AppCompatActivity {
|
||||
Button startButton;
|
||||
|
||||
@SuppressLint("WrongViewCast")
|
||||
|
||||
@Override
|
||||
protected void onCreate (Bundle savedInstanceState) {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main );
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
Button startButton = findViewById(R.id.startButton);
|
||||
startButton.setOnClickListener(v -> {
|
||||
Uri videoUri = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo);
|
||||
Intent intent = new Intent(MainActivity.this, FitnessActivity.class);
|
||||
intent.putExtra("videoUri", videoUri);
|
||||
startActivity(intent);
|
||||
});
|
||||
|
||||
|
||||
// Check if the device supports Bluetooth
|
||||
if (BluetoothAdapter.getDefaultAdapter() == null) {
|
||||
@@ -62,7 +67,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
|
||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
if (requestCode == REQUEST_LOCATION_PERMISSION && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
// Permission granted, initialize WiiBoardDiscoverer
|
||||
|
@@ -10,16 +10,16 @@ android:fitsSystemWindows="true"
|
||||
tools:context=".ui.activities.FitnessActivity"
|
||||
tools:openDrawer="start">
|
||||
|
||||
<com.example.fitbot.ui.components.PersonalMotionPreviewElement
|
||||
android:id="@+id/personalMotionPreviewElement"
|
||||
android:layout_width="600dp"
|
||||
android:layout_height="550dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.976"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.064" />
|
||||
<!-- <com.example.fitbot.ui.components.PersonalMotionPreviewElement-->
|
||||
<!-- android:id="@+id/personalMotionPreviewElement"-->
|
||||
<!-- android:layout_width="600dp"-->
|
||||
<!-- android:layout_height="550dp"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="0.976"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- app:layout_constraintVertical_bias="0.064" />-->
|
||||
|
||||
<VideoView
|
||||
android:id="@+id/videoView"
|
||||
|
Reference in New Issue
Block a user