diff --git a/.idea/misc.xml b/.idea/misc.xml
index 707ee6e613..2dc54c489f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/AndroidTTSPlayer.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/AndroidTTSPlayer.java
index eff9a24b2e..b8ac0c7c05 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/AndroidTTSPlayer.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/AndroidTTSPlayer.java
@@ -2,10 +2,12 @@ package com.mogo.utils.tts;
import android.content.Context;
import android.media.AudioManager;
-import android.os.Bundle;
import android.speech.tts.TextToSpeech;
import android.speech.tts.UtteranceProgressListener;
+import com.mogo.utils.logger.Logger;
+
+import java.util.HashMap;
import java.util.Locale;
/**
@@ -16,11 +18,12 @@ import java.util.Locale;
*/
public class AndroidTTSPlayer extends UtteranceProgressListener implements TTSPlayer, TextToSpeech.OnInitListener {
+ private static final String TAG = "AndroidTTSPlayer";
private TextToSpeech mTtsEngine;
private Context mContext;
private boolean mIsSuccess = false;
- private Bundle mParams;
+ private HashMap< String, String > mParams;
/**
* {@link TextToSpeech.Engine#KEY_PARAM_STREAM},
@@ -32,9 +35,10 @@ public class AndroidTTSPlayer extends UtteranceProgressListener implements TTSPl
public AndroidTTSPlayer( Context context ) {
mContext = context.getApplicationContext();
mTtsEngine = new TextToSpeech( mContext, this );
- mParams = new Bundle();
- mParams.putInt( TextToSpeech.Engine.KEY_PARAM_STREAM, AudioManager.STREAM_ALARM );
- mParams.putInt( TextToSpeech.Engine.KEY_PARAM_STREAM, AudioManager.STREAM_ALARM );
+ mParams = new HashMap<>();
+ mParams.put( TextToSpeech.Engine.KEY_PARAM_STREAM, AudioManager.STREAM_ALARM + "" );
+ mParams.put( TextToSpeech.Engine.KEY_PARAM_VOLUME, "1" );
+ mParams.put( TextToSpeech.Engine.KEY_PARAM_PAN, "0" );
}
@Override
@@ -46,7 +50,12 @@ public class AndroidTTSPlayer extends UtteranceProgressListener implements TTSPl
@Override
public void speakTTS( String text ) {
-// mTtsEngine.speak()
+ if ( !mIsSuccess ) {
+ Logger.d( TAG, "do not support tts play." );
+ return;
+ }
+ mParams.put( TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, text );
+ mTtsEngine.speak( text, TextToSpeech.QUEUE_FLUSH, mParams );
}
@Override
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/TTSPlayerFactory.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/TTSPlayerFactory.java
new file mode 100644
index 0000000000..f37ca1721d
--- /dev/null
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/tts/TTSPlayerFactory.java
@@ -0,0 +1,16 @@
+package com.mogo.utils.tts;
+
+import android.content.Context;
+
+/**
+ * @author congtaowang
+ * @since 2020-04-14
+ *
+ * 描述
+ */
+public class TTSPlayerFactory {
+
+ public static TTSPlayer getPlayer( Context context ) {
+ return new AndroidTTSPlayer( context );
+ }
+}
diff --git a/gradle.properties b/gradle.properties
index a1710e93d7..9eb100c972 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -74,5 +74,5 @@ MOGO_MODULE_PUSH_VERSION=1.0.1
# 广告资源位
MOGO_MODULE_AD_CARD_VERSION=1.0.1
# 新鲜事
-MOGO_MODULE_FRESH_NEWS_VERSION=1.0.3
+MOGO_MODULE_FRESH_NEWS_VERSION=1.0.3.1
diff --git a/upload.sh b/upload.sh
index 080861e7b2..317bc3cf79 100755
--- a/upload.sh
+++ b/upload.sh
@@ -19,5 +19,8 @@
./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives
./gradlew :modules:mogo-module-back:clean :modules:mogo-module-back:uploadArchives
./gradlew :modules:mogo-module-guide:clean :modules:mogo-module-guide:uploadArchives
+./gradlew :modules:mogo-module-gps-simulator:clean :modules:mogo-module-gps-simulator:uploadArchives
+./gradlew :modules:mogo-module-gps-simulator-debug:clean :modules:mogo-module-gps-simulator-debug:uploadArchives
+./gradlew :modules:mogo-module-gps-simulator-noop:clean :modules:mogo-module-gps-simulator-noop:uploadArchives