rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We can't catch exception here

This commit is contained in:
Snek 2017-03-10 10:57:52 +03:00
parent bc3fe07a2e
commit c5d064da54
3 changed files with 88 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
View File

@ -77,31 +77,27 @@ public class LaunchActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
if (!isPressed && isAppInstalled(LaunchActivity.this, "com.google.android.googlequicksearchbox")) {
try {
isPressed = true;
m = MediaPlayer.create(getApplicationContext(), R.raw.tone);
isPressed = true;
m = MediaPlayer.create(getApplicationContext(), R.raw.tone);
connect.setImageResource(R.drawable.connect_select);
connect.setImageResource(R.drawable.connect_select);
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
mp.start();
status.setText(R.string.connecting);
}
});
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
mp.start();
status.setText(R.string.connecting);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
mp.release();
Intent intent = new Intent(LaunchActivity.this,MainActivity.class);
startActivity(intent);
}
});
} catch (Exception e) {
e.printStackTrace();
}
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
mp.release();
Intent intent = new Intent(LaunchActivity.this,MainActivity.class);
startActivity(intent);
}
});
}
}
});

139
app/src/main/java/com/example/yink/amadeus/MainActivity.java
View File

@ -186,81 +186,80 @@ public class MainActivity extends AppCompatActivity {
}
public void speak(VoiceLine line) {
m = MediaPlayer.create(getApplicationContext(), line.getId());
final Visualizer v = new Visualizer(m.getAudioSessionId());
if (sharedPreferences.getBoolean("show_subtitles", false)) {
subtitles.setText(line.getSubtitle());
}
Resources res = getResources();
try {
m = MediaPlayer.create(getApplicationContext(), line.getId());
final Visualizer v = new Visualizer(m.getAudioSessionId());
if (sharedPreferences.getBoolean("show_subtitles", false)) {
subtitles.setText(line.getSubtitle());
}
Resources res = getResources();
animation = (AnimationDrawable) Drawable.createFromXml(res, res.getXml(line.getMood()));
if (m.isPlaying()) {
m.stop();
m.release();
v.setEnabled(false);
m = new MediaPlayer();
}
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
isSpeaking = true;
mp.start();
v.setEnabled(true);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
isSpeaking = false;
mp.release();
v.setEnabled(false);
runOnUiThread(new Runnable() {
@Override
public void run() {
kurisu.setImageDrawable(animation.getFrame(0));
}
});
}
});
v.setEnabled(false);
v.setCaptureSize(Visualizer.getCaptureSizeRange()[1]);
v.setDataCaptureListener(
new Visualizer.OnDataCaptureListener() {
public void onWaveFormDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) {
int sum = 0;
for (int i = 1; i < bytes.length; i++) {
sum += bytes[i] + 128;
}
// The normalized volume
final float normalized = sum / (float) bytes.length;
runOnUiThread(new Runnable() {
@Override
public void run() {
if (normalized > 50) {
// Todo: Maybe choose sprite based on previous choice and volume instead of random
kurisu.setImageDrawable(animation.getFrame((int) Math.ceil(Math.random() * 2)));
} else {
kurisu.setImageDrawable(animation.getFrame(0));
}
}
});
}
public void onFftDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) { }
}, Visualizer.getMaxCaptureRate() / 2, true, false);
} catch (Exception e) {
e.printStackTrace();
}
if (m.isPlaying()) {
m.stop();
m.release();
v.setEnabled(false);
m = new MediaPlayer();
}
m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mp) {
isSpeaking = true;
mp.start();
v.setEnabled(true);
}
});
m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
isSpeaking = false;
mp.release();
v.setEnabled(false);
runOnUiThread(new Runnable() {
@Override
public void run() {
kurisu.setImageDrawable(animation.getFrame(0));
}
});
}
});
v.setEnabled(false);
v.setCaptureSize(Visualizer.getCaptureSizeRange()[1]);
v.setDataCaptureListener(
new Visualizer.OnDataCaptureListener() {
public void onWaveFormDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) {
int sum = 0;
for (int i = 1; i < bytes.length; i++) {
sum += bytes[i] + 128;
}
// The normalized volume
final float normalized = sum / (float) bytes.length;
runOnUiThread(new Runnable() {
@Override
public void run() {
if (normalized > 50) {
// Todo: Maybe choose sprite based on previous choice and volume instead of random
kurisu.setImageDrawable(animation.getFrame((int) Math.ceil(Math.random() * 2)));
} else {
kurisu.setImageDrawable(animation.getFrame(0));
}
}
});
}
public void onFftDataCapture(Visualizer visualizer, byte[] bytes, int samplingRate) { }
}, Visualizer.getMaxCaptureRate() / 2, true, false);
}
private void openApp(String[] input) {

2
app/src/main/res/xml/preferences.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="Subtitle Settings">
<PreferenceCategory android:title="Application preferences">
<SwitchPreference
android:defaultValue="false"
android:key="show_subtitles"