mirror of https://github.com/tasks/tasks
Remove RecognizerApi
Alex Baker
10 years ago
parent
502c31bfbc
commit
1522dae01b
@ -1,181 +0,0 @@
|
||||
package com.todoroo.astrid.voice;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.DialogInterface.OnCancelListener;
|
||||
import android.content.Intent;
|
||||
import android.media.MediaPlayer;
|
||||
import android.os.Bundle;
|
||||
import android.speech.RecognitionListener;
|
||||
import android.speech.RecognizerIntent;
|
||||
import android.speech.SpeechRecognizer;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@TargetApi(8)
|
||||
public class RecognizerApi implements RecognitionListener {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(RecognizerApi.class);
|
||||
|
||||
public static interface PlaybackExceptionHandler {
|
||||
public void playbackFailed();
|
||||
}
|
||||
|
||||
private Context context;
|
||||
|
||||
public static interface RecognizerApiListener {
|
||||
public void onSpeechResult(String result);
|
||||
|
||||
public void onSpeechError(int error);
|
||||
}
|
||||
|
||||
private RecognizerApiListener mListener;
|
||||
|
||||
public RecognizerApi(Context context) {
|
||||
this.context = context;
|
||||
|
||||
sr = SpeechRecognizer.createSpeechRecognizer(context);
|
||||
}
|
||||
|
||||
public void setListener(RecognizerApiListener listener) {
|
||||
this.mListener = listener;
|
||||
}
|
||||
|
||||
public static void play(String file, PlaybackExceptionHandler handler) {
|
||||
MediaPlayer mediaPlayer = new MediaPlayer();
|
||||
|
||||
try {
|
||||
mediaPlayer.setDataSource(file);
|
||||
mediaPlayer.prepare();
|
||||
mediaPlayer.start();
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage(), e);
|
||||
handler.playbackFailed();
|
||||
}
|
||||
}
|
||||
|
||||
private long speechStarted = 0;
|
||||
private SpeechRecognizer sr;
|
||||
private ProgressDialog speakPd;
|
||||
private ProgressDialog processingPd;
|
||||
|
||||
public void start(String callingPackage, String speakNowMessage) {
|
||||
sr.setRecognitionListener(this);
|
||||
|
||||
Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
|
||||
intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
|
||||
RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
|
||||
intent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, callingPackage);
|
||||
|
||||
speechStarted = 0;
|
||||
baos.reset();
|
||||
|
||||
speakPd = new ProgressDialog(context);
|
||||
speakPd.setMessage(speakNowMessage);
|
||||
speakPd.setIndeterminate(true);
|
||||
speakPd.setCancelable(true);
|
||||
speakPd.setOnCancelListener(new OnCancelListener() {
|
||||
@Override
|
||||
public void onCancel(DialogInterface dialog) {
|
||||
sr.cancel();
|
||||
onEndOfSpeech();
|
||||
}
|
||||
});
|
||||
|
||||
speakPd.show();
|
||||
sr.startListening(intent);
|
||||
|
||||
speechStarted = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
public void cancel() {
|
||||
sr.cancel();
|
||||
}
|
||||
|
||||
public void destroy() {
|
||||
sr.setRecognitionListener(null);
|
||||
sr.destroy();
|
||||
}
|
||||
|
||||
// --- RecognitionListener methods --- //
|
||||
|
||||
private ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
|
||||
@Override
|
||||
public void onBeginningOfSpeech() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBufferReceived(byte[] buffer) {
|
||||
if (speechStarted > 0) {
|
||||
try {
|
||||
baos.write(buffer);
|
||||
} catch (IOException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEndOfSpeech() {
|
||||
speakPd.dismiss();
|
||||
|
||||
if (speechStarted == 0)
|
||||
return;
|
||||
|
||||
processingPd = new ProgressDialog(context);
|
||||
processingPd.setMessage("");
|
||||
processingPd.setIndeterminate(true);
|
||||
processingPd.setCancelable(true);
|
||||
processingPd.setOnCancelListener(new OnCancelListener() {
|
||||
@Override
|
||||
public void onCancel(DialogInterface dialog) {
|
||||
sr.cancel();
|
||||
}
|
||||
});
|
||||
processingPd.show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(int error) {
|
||||
log.error("Error code " + error, new RuntimeException());
|
||||
if (mListener != null) {
|
||||
mListener.onSpeechError(error);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEvent(int arg0, Bundle arg1) {
|
||||
//
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPartialResults(Bundle partialResults) {
|
||||
onResults(partialResults);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReadyForSpeech(Bundle arg0) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResults(Bundle results) {
|
||||
processingPd.dismiss();
|
||||
ArrayList<String> strings = results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
|
||||
if (mListener != null) {
|
||||
mListener.onSpeechResult(strings == null || strings.size() == 0 ? "" : strings.get(0));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRmsChanged(float arg0) {
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,99 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2012 Todoroo Inc
|
||||
*
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.voice;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.speech.RecognizerIntent;
|
||||
import android.speech.SpeechRecognizer;
|
||||
import android.support.v4.app.Fragment;
|
||||
|
||||
import com.todoroo.andlib.utility.AndroidUtilities;
|
||||
import com.todoroo.astrid.utility.Constants;
|
||||
import com.todoroo.astrid.voice.RecognizerApi.RecognizerApiListener;
|
||||
|
||||
import org.tasks.R;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@TargetApi(8)
|
||||
public class VoiceRecognizer {
|
||||
|
||||
protected RecognizerApi recognizerApi;
|
||||
protected VoiceInputAssistant voiceInputAssistant;
|
||||
|
||||
public static boolean speechRecordingAvailable(Context context) {
|
||||
return AndroidUtilities.getSdkVersion() >= 8 &&
|
||||
SpeechRecognizer.isRecognitionAvailable(context);
|
||||
}
|
||||
|
||||
/**
|
||||
* Call this to see if your phone supports voiceinput in its current configuration.
|
||||
* If this method returns false, it could also mean that Google Voicesearch is simply
|
||||
* not installed.
|
||||
* If this method returns true, internal use of it enables the registered microphone-button.
|
||||
*
|
||||
* @return whether this phone supports voiceinput
|
||||
*/
|
||||
public static boolean voiceInputAvailable(Context context) {
|
||||
PackageManager pm = context.getPackageManager();
|
||||
List<ResolveInfo> activities = pm.queryIntentActivities(
|
||||
new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH), 0);
|
||||
return (activities.size() != 0);
|
||||
}
|
||||
|
||||
private VoiceRecognizer() {
|
||||
//
|
||||
}
|
||||
|
||||
private static VoiceRecognizer instance = null;
|
||||
|
||||
public static VoiceRecognizer instantiateVoiceRecognizer(Activity activity, RecognizerApiListener listener) {
|
||||
synchronized(VoiceRecognizer.class) {
|
||||
if (instance == null) {
|
||||
instance = new VoiceRecognizer();
|
||||
}
|
||||
}
|
||||
|
||||
if (speechRecordingAvailable(activity)) {
|
||||
if (instance.recognizerApi != null) {
|
||||
instance.recognizerApi.destroy();
|
||||
}
|
||||
|
||||
instance.recognizerApi = new RecognizerApi(activity);
|
||||
instance.recognizerApi.setListener(listener);
|
||||
} else {
|
||||
instance.voiceInputAssistant = new VoiceInputAssistant(activity);
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void startVoiceRecognition(Context context, Fragment fragment) {
|
||||
if (speechRecordingAvailable(context) && recognizerApi != null) {
|
||||
recognizerApi.start(Constants.PACKAGE, context.getString(R.string.audio_speak_now));
|
||||
} else {
|
||||
int prompt = R.string.voice_create_prompt;
|
||||
voiceInputAssistant.startVoiceRecognitionActivity(fragment, prompt);
|
||||
}
|
||||
}
|
||||
|
||||
public void destroyRecognizerApi() {
|
||||
if (instance != null && instance.recognizerApi != null) {
|
||||
instance.recognizerApi.destroy();
|
||||
instance.recognizerApi = null;
|
||||
}
|
||||
}
|
||||
|
||||
public void cancel() {
|
||||
if (instance != null && instance.recognizerApi != null) {
|
||||
instance.recognizerApi.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue