speech_recognition/FunASR
1
0
Fork 0
mirror of https://github.com/modelscope/FunASR synced 2025-09-15 14:48:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR into main

Browse Source
This commit is contained in:
雾聪 2023-11-30 09:49:40 +08:00
commit 168d4ac2ff
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
runtime/android/AndroidClient/app/src/main/java/com/yeyupiaoling/androidclient/MainActivity.java
View File

@ -47,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
public static final int CHUNK_INTERVAL = 10; public static final int CHUNK_INTERVAL = 10;
public static final int SEND_SIZE = 1920; public static final int SEND_SIZE = 1920;
// 热词 // 热词
private String hotWords = "阿里巴巴 达摩院 夜雨飘零"; private String hotWords = "阿里巴巴 20\n达摩院 20\n夜雨飘零 20\n";
// 采样率 // 采样率
public static final int SAMPLE_RATE = 16000; public static final int SAMPLE_RATE = 16000;
// 声道数 // 声道数
@ -287,6 +287,7 @@ public class MainActivity extends AppCompatActivity {
} }
}); });
String message = getMessage(true); String message = getMessage(true);
Log.d(TAG, "WebSocket发送消息: " + message);
webSocket.send(message); webSocket.send(message);
audioRecord.startRecording(); audioRecord.startRecording();
@ -319,7 +320,23 @@ public class MainActivity extends AppCompatActivity {
obj.put("chunk_interval", CHUNK_INTERVAL); obj.put("chunk_interval", CHUNK_INTERVAL);
obj.put("wav_name", "default"); obj.put("wav_name", "default");
if (!hotWords.equals("")) { if (!hotWords.equals("")) {
obj.put("hotwords", hotWords); JSONObject hotwordsJSON = new JSONObject();
// 分割每一行字符串
String[] hotWordsList = hotWords.split("\n");
for (String s : hotWordsList) {
if (s.equals("")) {
Log.w(TAG, "hotWords为空");
continue;
}
// 按照空格分割字符串
String[] hotWordsArray = s.split(" ");
if (hotWordsArray.length != 2) {
Log.w(TAG, "hotWords格式不正确");
continue;
}
hotwordsJSON.put(hotWordsArray[0], Integer.valueOf(hotWordsArray[1]));
}
obj.put("hotwords", hotwordsJSON.toString());
} }
obj.put("wav_format", "pcm"); obj.put("wav_format", "pcm");
obj.put("is_speaking", isSpeaking); obj.put("is_speaking", isSpeaking);

2
runtime/android/AndroidClient/app/src/main/res/layout/dialog_input_hotwords.xml
View File

@ -13,6 +13,6 @@
android:background="@drawable/edittext_border" android:background="@drawable/edittext_border"
android:minLines="3" android:minLines="3"
android:gravity="top" android:gravity="top"
android:hint="每个热词用空格隔开" /> android:hint="每一行为:热词 权重" />
</LinearLayout> </LinearLayout>