更新demo

shenbengit · Jul 21, 2021 · 8dc4f4a · 8dc4f4a
1 parent 4a686b9
commit 8dc4f4a
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,6 +15,11 @@ android {
         versionName rootProject.ext.android.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        ndk {
+            // 设置支持的SO库架构，仅支持armeabi-v7a、arm64-v8a，若想减小APK体积，可只引用对应的SO库架构
+            abiFilters 'armeabi-v7a'//, 'arm64-v8a'
+        }
     }
 
     buildTypes {
@@ -47,17 +52,13 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(path: ':lib')
-    implementation project(path: ':lib-v7a')
-    implementation project(path: ':lib-v8a')
-//    implementation 'com.github.shenbengit.TTSTool:lib:1.0.1'
-//    implementation 'com.github.shenbengit.TTSTool:lib-v7a:1.0.1'
-//    implementation 'com.github.shenbengit.TTSTool:lib-v8a:1.0.1'
+//    implementation 'com.github.shenbengit.TTSTool:lib:1.0.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.TTSTool">
+        <activity android:name=".JavaActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/shencoder/ttstooldemo/JavaActivity.java b/app/src/main/java/com/shencoder/ttstooldemo/JavaActivity.java
@@ -0,0 +1,26 @@
+package com.shencoder.ttstooldemo;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.iflytek.cloud.InitListener;
+import com.shencoder.ttstool.TTSManager;
+import com.shencoder.ttstool.TTSManagerExtKt;
+
+public class JavaActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_java);
+        findViewById(R.id.btnTTS).setOnClickListener(v -> TTSManagerExtKt.startSpeaking("啦啦啦德玛西亚"));
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/app/src/main/java/com/shencoder/ttstooldemo/MainActivity.kt b/app/src/main/java/com/shencoder/ttstooldemo/MainActivity.kt
@@ -1,19 +1,19 @@
 package com.shencoder.ttstooldemo
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import com.shencoder.ttstool.destroyTTS
 import com.shencoder.ttstool.initTTS
-import com.shencoder.ttstool.startSpeaking
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        initTTS(this, "appId", true)
+        initTTS(this, "97939e0c", true)
         findViewById<Button>(R.id.btnTTS).setOnClickListener {
-            startSpeaking("播报测试")
+            startActivity(Intent(this,JavaActivity::class.java))
         }
     }
 

diff --git a/app/src/main/res/layout/activity_java.xml b/app/src/main/res/layout/activity_java.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".JavaActivity">
+
+    <Button
+        android:id="@+id/btnTTS"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TTS"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
         android:id="@+id/btnTTS"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TTS"
+        android:text="跳转到JavaActivity"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"