diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0d156937bb..663459aa50 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,18 +3,9 @@ - diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 60a7c097ae..8853517620 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle index d2d31b392a..172da172b0 100644 --- a/app/functions/tts.gradle +++ b/app/functions/tts.gradle @@ -1,6 +1,6 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { - bydautoImplementation rootProject.ext.dependencies.ttszhi + bydautoImplementation rootProject.ext.dependencies.ttsdi d82xImplementation rootProject.ext.dependencies.ttszhi em1Implementation rootProject.ext.dependencies.ttszhi em3Implementation rootProject.ext.dependencies.ttszhi @@ -11,7 +11,7 @@ project.dependencies { em4Implementation rootProject.ext.dependencies.ttszhi e8xxImplementation rootProject.ext.dependencies.ttszhi } else { - bydautoImplementation project(':tts:tts-zhi') + bydautoImplementation project(':tts:tts-di') d82xImplementation project(':tts:tts-zhi') em1Implementation project(':tts:tts-zhi') em3Implementation project(':tts:tts-zhi') diff --git a/config.gradle b/config.gradle index 0cd99d5ebd..bebbb13de0 100644 --- a/config.gradle +++ b/config.gradle @@ -211,6 +211,7 @@ targetSdkVersion : 22, ttsbase : "com.mogo.tts:tts-base:${TTS_BASE_VERSION}", ttsdi : "com.mogo.tts:tts-di:${TTS_DI_VERSION}", ttszhi : "com.mogo.tts:tts-zhi:${TTS_ZHI_VERSION}", + ttsnoop : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}", ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 06a450d5ff..7ebe5f7afc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -102,6 +102,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0 TTS_BASE_VERSION=1.0.0 TTS_DI_VERSION=1.0.0 TTS_ZHI_VERSION=1.0.0 +TTS_NOOP_VERSION=1.0.0 ######## 外部依赖引用 # 车聊聊 diff --git a/settings.gradle b/settings.gradle index 586a4e0034..9f7e5afea2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ include ':tts:tts-base' include ':tts:tts-di' include ':tts:tts-zhi' +include ':tts:tts-noop' include ':test:crashreport' include ':test:crashreport-bugly' include ':test:crashreport-noop' diff --git a/tts/tts-di/src/main/AndroidManifest.xml b/tts/tts-di/src/main/AndroidManifest.xml index ca38303340..9992a8a707 100644 --- a/tts/tts-di/src/main/AndroidManifest.xml +++ b/tts/tts-di/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.tts.noop"> / \ No newline at end of file diff --git a/tts/tts-di/src/main/java/com/mogo/tts/di/DiTTS.java b/tts/tts-di/src/main/java/com/mogo/tts/noop/DiTTS.java similarity index 98% rename from tts/tts-di/src/main/java/com/mogo/tts/di/DiTTS.java rename to tts/tts-di/src/main/java/com/mogo/tts/noop/DiTTS.java index 1a489dd712..1c0ac5d88d 100644 --- a/tts/tts-di/src/main/java/com/mogo/tts/di/DiTTS.java +++ b/tts/tts-di/src/main/java/com/mogo/tts/noop/DiTTS.java @@ -1,4 +1,4 @@ -package com.mogo.tts.di; +package com.mogo.tts.noop; import android.content.Context; import android.util.Log; diff --git a/tts/tts-di/src/main/java/com/mogo/tts/di/TTSManager.java b/tts/tts-di/src/main/java/com/mogo/tts/noop/TTSManager.java similarity index 98% rename from tts/tts-di/src/main/java/com/mogo/tts/di/TTSManager.java rename to tts/tts-di/src/main/java/com/mogo/tts/noop/TTSManager.java index 33c0e3b48e..f094245439 100644 --- a/tts/tts-di/src/main/java/com/mogo/tts/di/TTSManager.java +++ b/tts/tts-di/src/main/java/com/mogo/tts/noop/TTSManager.java @@ -1,4 +1,4 @@ -package com.mogo.tts.di; +package com.mogo.tts.noop; import android.content.Context; import android.content.Intent; diff --git a/tts/tts-noop/.gitignore b/tts/tts-noop/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/tts/tts-noop/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/tts/tts-noop/build.gradle b/tts/tts-noop/build.gradle new file mode 100644 index 0000000000..caae249d60 --- /dev/null +++ b/tts/tts-noop/build.gradle @@ -0,0 +1,50 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.alibaba.arouter' + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + // buildToolsVersion rootProject.ext.android.buildToolsVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode Integer.valueOf(VERSION_CODE) + versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") + + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + + javaCompileOptions { + annotationProcessorOptions { + arguments = [AROUTER_MODULE_NAME: project.getName()] + } + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.arouter + annotationProcessor rootProject.ext.dependencies.aroutercompiler + + if (Boolean.valueOf(RELEASE)) { + implementation rootProject.ext.dependencies.ttsbase + } else { + implementation project(":tts:tts-base") + } +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/tts/tts-noop/consumer-rules.pro b/tts/tts-noop/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tts/tts-noop/gradle.properties b/tts/tts-noop/gradle.properties new file mode 100644 index 0000000000..766cca1f72 --- /dev/null +++ b/tts/tts-noop/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.tts +POM_ARTIFACT_ID=tts-noop +VERSION_CODE=1 diff --git a/tts/tts-noop/proguard-rules.pro b/tts/tts-noop/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/tts/tts-noop/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/tts/tts-noop/src/main/AndroidManifest.xml b/tts/tts-noop/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..9992a8a707 --- /dev/null +++ b/tts/tts-noop/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + / + \ No newline at end of file diff --git a/tts/tts-noop/src/main/java/com/mogo/tts/noop/NoopTTS.java b/tts/tts-noop/src/main/java/com/mogo/tts/noop/NoopTTS.java new file mode 100644 index 0000000000..717e576b93 --- /dev/null +++ b/tts/tts-noop/src/main/java/com/mogo/tts/noop/NoopTTS.java @@ -0,0 +1,91 @@ +package com.mogo.tts.noop; + +import android.content.Context; +import android.util.Log; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.tts.base.IMogoTTS; +import com.mogo.tts.base.IMogoTTSCallback; +import com.mogo.tts.base.MogoTTSConstants; +import com.mogo.tts.base.PreemptType; + +public +/** + * @author congtaowang + * @since 2020/10/13 + * + * 无语音播报 + */ +@Route( path = MogoTTSConstants.API_PATH ) +class NoopTTS implements IMogoTTS { + + private static final String TAG = "NoopTTS"; + + @Override + public void release() { + } + + @Override + public void flush() { + Log.d( TAG, "noop - flush" ); + } + + @Override + public void speakTTSVoice( String tts ) { + Log.d( TAG, "noop - speakTTSVoice" ); + } + + @Override + public void speakTTSVoice( String tts, IMogoTTSCallback callback ) { + speakTTSVoice( tts ); + } + + @Override + public void speakTTSVoice( String tts, PreemptType type, IMogoTTSCallback callback ) { + speakTTSVoice( tts ); + } + + @Override + public void speakQAndACmd( String tts, IMogoTTSCallback callback ) { + Log.d( TAG, "noop - speakQAndACmd" ); + } + + @Override + public void speakQAndACmd( String tts, String[] okWords, String[] cancelWords, IMogoTTSCallback callback ) { + Log.d( TAG, "noop - speakQAndACmd2" ); + } + + @Override + public void registerUnWakeupCommand( String cmd, String[] cmdWords, IMogoTTSCallback callback ) { + Log.d( TAG, "noop - registerUnWakeupCommand" ); + } + + @Override + public void unregisterUnWakeupCommand( String cmd ) { + Log.d( TAG, "noop - unregisterUnWakeupCommand" ); + } + + @Override + public void unregisterUnWakeupCommand( String cmd, IMogoTTSCallback callback ) { + Log.d( TAG, "noop - unregisterUnWakeupCommand2" ); + } + + @Override + public void startAIAssist( Context context ) { + Log.d( TAG, "noop - startAIAssist" ); + } + + @Override + public void startAIAssist( Context context, int status ) { + Log.d( TAG, "noop - startAIAssist2" ); + } + + @Override + public void breakOffSpeak() { + Log.d( TAG, "noop - breakOffSpeak" ); + } + + @Override + public void init( Context context ) { + } +} diff --git a/upload.sh b/upload.sh index 58e61315e2..054ba576f4 100755 --- a/upload.sh +++ b/upload.sh @@ -10,6 +10,8 @@ if [ $? -ne 0 ]; then exit; fi if [ $? -ne 0 ]; then exit; fi ./gradlew :tts:tts-di:clean :tts:tts-di:uploadArchives if [ $? -ne 0 ]; then exit; fi +./gradlew :tts:tts-noop:clean :tts:tts-noop:uploadArchives +if [ $? -ne 0 ]; then exit; fi ./gradlew :foudations:mogo-commons:clean :foudations:mogo-commons:uploadArchives if [ $? -ne 0 ]; then exit; fi ./gradlew :libraries:mogo-map-api:clean :libraries:mogo-map-api:uploadArchives