Skip to content

A
aivoice_plugin
提交 84e8b07c 作者: 王苏进
操作

feat: 调整方法

上级 a68b90f8
正在显示 包含 57 行增加 和 49 行删除
android/src/main/java/com/yourcompany/aivoiceplugin/AivoicePlugin.java
......@@ -29,6 +29,8 @@ public class AivoicePlugin implements FlutterPlugin, MethodCallHandler, EventCha
// 删除了 getPlatformVersion 方法的实现
if (call.method.equals("initEngine")) {
// 处理 config 参数
Map<String, Object> config = call.arguments();
// 空实现
result.success(null);
} else if (call.method.equals("stopEngine")) {
......
example/ios/Runner/AppDelegate.swift
......@@ -9,29 +9,13 @@ import aivoice_plugin
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
let ret = SpeechEngine.prepareEnvironment();
if ret {
setupResourceManager()
}
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
func setupResourceManager() {
let ins = SpeechResourceManager.shareInstance()
ins.setAppId(SDEF_APPID)
ins.setAppVersion("1.0.0")
if let documentDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
let modelsPath = documentDirectory.appendingPathComponent("models").path
ins.setRootPath(modelsPath)
}
ins.setOnlineModelEnable(true)
ins.setup()
}
}
example/lib/main.dart
......@@ -20,6 +20,13 @@ class _MyAppState extends State<MyApp> {
String _text = '';
final configMap = {
"appId": "2301072440",
"token": "Bearer;75UvJCpxRjTCppqQUkQ-o-4UfjnCgVmp",
"voiceType": "BV213_w5H18f6VbKnhg3Ph",
"voice": "灿灿"
};
@override
void initState() {
super.initState();
......@@ -31,7 +38,7 @@ class _MyAppState extends State<MyApp> {
});
// print(event["text"]);
});
// _aivoicePlugin.initEngine({});
_aivoicePlugin.prepareEnvironment({"appId": "2301072440"});
}
// Platform messages are asynchronous, so we initialize in an async method.
......@@ -59,7 +66,7 @@ class _MyAppState extends State<MyApp> {
children: [
TextButton(
onPressed: () {
_aivoicePlugin.initEngine({});
_aivoicePlugin.initEngine(configMap);
},
child: const Text('init')),
TextButton(
......
ios/Classes/AivoicePlugin.m
......@@ -5,6 +5,8 @@
@property (nonatomic, strong) FlutterEventSink eventSink;
@property(nonatomic, strong)VoiceAsr * voiceAsr;
@property(nonatomic, strong)NSDictionary * config;
@end
@implementation AivoicePlugin
......@@ -28,7 +30,8 @@
// 删除了 getPlatformVersion 方法的实现
if ([@"initEngine" isEqualToString:call.method]) {
[self.voiceAsr initEngine];
self.config = call.arguments;
[self.voiceAsr initEngineWithConfig:call.arguments];
result(nil);
} else if ([@"stopEngine" isEqualToString:call.method]) {
[self.voiceAsr stopEngineBtnClicked];
......@@ -69,7 +72,7 @@
- (VoiceAsr *)voiceAsr {
if(!_voiceAsr) {
_voiceAsr = [[VoiceAsr alloc] initWithDelegate:self];
_voiceAsr = [[VoiceAsr alloc] initWithDelegate:self config:self.config];
}
return _voiceAsr;
}
......
ios/Classes/SensitiveDefines.h
......@@ -18,8 +18,8 @@
extern NSString* SDEF_UID;
// Online & Resource Authentication
extern NSString* SDEF_APPID;
extern NSString* SDEF_TOKEN;
//extern NSString* SDEF_APPID;
//extern NSString* SDEF_TOKEN;
extern NSString* SDEF_APP_VERSION;
// Offline Authentication
......@@ -46,8 +46,8 @@ extern NSString* SDEF_AU_DEFAULT_URI;
extern NSString* SDEF_TTS_DEFAULT_URI;
extern NSString* SDEF_TTS_DEFAULT_CLUSTER;
extern NSString* SDEF_TTS_DEFAULT_BACKEND_CLUSTER;
extern NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE;
extern NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE_TYPE;
//extern NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE;
//extern NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE_TYPE;
extern NSString* SDEF_TTS_DEFAULT_OFFLINE_VOICE;
extern NSString* SDEF_TTS_DEFAULT_OFFLINE_VOICE_TYPE;
extern NSString* SDEF_TTS_DEFAULT_ONLINE_LANGUAGE;
......
ios/Classes/SensitiveDefines.m
......@@ -15,8 +15,8 @@
const NSString* SDEF_UID = @"YOUR UID";
// Online & Resource Authentication
const NSString* SDEF_APPID = @"2301072440";
const NSString* SDEF_TOKEN = @"Bearer;75UvJCpxRjTCppqQUkQ-o-4UfjnCgVmp";//;
//const NSString* SDEF_APPID = @"2301072440";
//const NSString* SDEF_TOKEN = @"Bearer;75UvJCpxRjTCppqQUkQ-o-4UfjnCgVmp";//;
const NSString* SDEF_APP_VERSION = @"1.0.0";
// Offline Authentication
......@@ -43,8 +43,8 @@ const NSString* SDEF_AU_DEFAULT_URI = @"/api/v1/sauc";
const NSString* SDEF_TTS_DEFAULT_URI = @"/api/v1/tts/ws_binary";
const NSString* SDEF_TTS_DEFAULT_CLUSTER = @"volcano_tts";
const NSString* SDEF_TTS_DEFAULT_BACKEND_CLUSTER = @"YOUR TTS BACKEND CLUSTER";
const NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE = @"灿灿";
const NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE_TYPE = @"BV213_w5H18f6VbKnhg3Ph";
//const NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE = @"灿灿";
//const NSString* SDEF_TTS_DEFAULT_ONLINE_VOICE_TYPE = @"BV213_w5H18f6VbKnhg3Ph";
//BV002_streaming BV021_PSj8BvWAZyepfUPB BV705_streaming BV115_H74MBi790rUFu993 BV213_w5H18f6VbKnhg3Ph
const NSString* SDEF_TTS_DEFAULT_OFFLINE_VOICE = @"YOUR TTS OFFLINE VOICE";
const NSString* SDEF_TTS_DEFAULT_OFFLINE_VOICE_TYPE = @"YOUR TTS OFFLINE VOICE TYPE";
......
ios/Classes/SettingsHelper.m
......@@ -244,8 +244,8 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
[sharedInstance.asrSettings registerItems:@[
// common
[SettingItem buildGroup:SETTING_COMMON val:@"" hint:@""],
[SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
[SettingItem buildString:SETTING_TOKEN val:SDEF_TOKEN hint:@""],
// [SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_TOKEN val:SDEF_TOKEN hint:@""],
[SettingItem buildString:SETTING_CLUSTER val:SDEF_ASR_DEFAULT_CLUSTER hint:SETTING_HINT_CLUSTER],
[SettingItem buildString:SETTING_ADDRESS val:SDEF_DEFAULT_ADDRESS hint:SETTING_HINT_ADDRESS],
[SettingItem buildString:SETTING_URI val:SDEF_ASR_DEFAULT_URI hint:SETTING_HINT_URI],
......@@ -282,7 +282,7 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
[sharedInstance.asrOfflineSettings registerItems:@[
// common
[SettingItem buildGroup:SETTING_COMMON val:@"" hint:@""],
[SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
[SettingItem buildOptions:SETTING_RECORD_TYPE val:[SettingOptions build:SETTING_OPTIONS_RECORD_TYPE() choose:0] hint:@""],
[SettingItem buildInt:SETTING_VAD_MAX_SPEECH_DURATION val:15000 hint:@""],
[SettingItem buildInt:SETTING_STREAM_PACKAGE_DURATION val:20000 hint:@""],
......@@ -302,8 +302,8 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
[SettingItem buildString:SETTING_CLUSTER val:SDEF_CAPT_DEFAULT_CLUSTER hint:SETTING_HINT_CLUSTER],
[SettingItem buildString:SETTING_ADDRESS val:SDEF_DEFAULT_ADDRESS hint:SETTING_HINT_ADDRESS],
[SettingItem buildString:SETTING_URI val:@"" hint:SETTING_HINT_URI],
[SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
[SettingItem buildString:SETTING_TOKEN val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_TOKEN val:SDEF_APPID hint:@""],
[SettingItem buildBool:SETTING_GET_VOLUME val:false hint:@""],
[SettingItem buildOptions:SETTING_RECORD_TYPE val:[SettingOptions build:SETTING_OPTIONS_RECORD_TYPE() choose:0] hint:@""],
[SettingItem buildBool:SETTING_ENABLE_AEC val:false hint:@""],
......@@ -355,8 +355,9 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
[SettingItem buildString:SETTING_CLUSTER val:SDEF_TTS_DEFAULT_CLUSTER hint:SETTING_HINT_CLUSTER],
[SettingItem buildString:SETTING_ADDRESS val:SDEF_DEFAULT_ADDRESS hint:SETTING_HINT_ADDRESS],
[SettingItem buildString:SETTING_URI val:SDEF_TTS_DEFAULT_URI hint:SETTING_HINT_URI],
[SettingItem buildString:SETTING_ONLINE_VOICE val:SDEF_TTS_DEFAULT_ONLINE_VOICE hint:SETTING_HINT_ONLINE_VOICE],
[SettingItem buildString:SETTING_ONLINE_VOICE_TYPE val:SDEF_TTS_DEFAULT_ONLINE_VOICE_TYPE hint:SETTING_HINT_ONLINE_VOICE_TYPE],
// [SettingItem buildString:SETTING_ONLINE_VOICE val:SDEF_TTS_DEFAULT_ONLINE_VOICE hint:SETTING_HINT_ONLINE_VOICE],
// [SettingItem buildString:SETTING_ONLINE_VOICE_TYPE val:SDEF_TTS_DEFAULT_ONLINE_VOICE_TYPE hint:SETTING_HINT_ONLINE_VOICE_TYPE],
[SettingItem buildString:SETTING_OFFLINE_VOICE val:SDEF_TTS_DEFAULT_OFFLINE_VOICE hint:SETTING_HINT_OFFLINE_VOICE],
[SettingItem buildString:SETTING_OFFLINE_VOICE_TYPE val:SDEF_TTS_DEFAULT_OFFLINE_VOICE_TYPE hint:SETTING_HINT_OFFLINE_VOICE_TYPE],
[SettingItem buildOptions:SETTING_AUTHENTICATION_TYPE val:[SettingOptions build:SETTING_OPTIONS_AUTHENTICATION_TYPE() choose:0] hint:@""],
......@@ -397,8 +398,8 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
// common
[SettingItem buildGroup:SETTING_COMMON val:@"" hint:@""],
[SettingItem buildInt:SETTING_SAMPLE_RATE val:44100 hint:@""],
[SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
[SettingItem buildString:SETTING_TOKEN val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_TOKEN val:SDEF_APPID hint:@""],
[SettingItem buildOptions:SETTING_RECORD_TYPE val:[SettingOptions build:SETTING_OPTIONS_RECORD_TYPE() choose:0] hint:@""],
// voiceclone
......@@ -435,8 +436,8 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
[sharedInstance.dialogSettings registerItems:@[
// common
[SettingItem buildGroup:SETTING_COMMON val:@"" hint:@""],
[SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
[SettingItem buildString:SETTING_TOKEN val:SDEF_TOKEN hint:@""],
// [SettingItem buildString:SETTING_APPID val:SDEF_APPID hint:@""],
// [SettingItem buildString:SETTING_TOKEN val:SDEF_TOKEN hint:@""],
[SettingItem buildString:SETTING_ADDRESS val:SDEF_DEFAULT_ADDRESS hint:SETTING_HINT_ADDRESS],
[SettingItem buildString:SETTING_URI val:SDEF_DIALOG_DEFAULT_URI hint:SETTING_HINT_URI],
......@@ -471,7 +472,7 @@ static NSArray* SETTING_OPTIONS_AU_ABILITY(void) {
// common
[SettingItem buildGroup:SETTING_COMMON val:@"" hint:@""],
[SettingItem buildString:SETTING_APPID val:@"vs_tt_input_qa" hint:@""],
[SettingItem buildString:SETTING_TOKEN val:SDEF_TOKEN hint:@""],
// [SettingItem buildString:SETTING_TOKEN val:SDEF_TOKEN hint:@""],
[SettingItem buildString:SETTING_CLUSTER val:@"vs_tt_input_qa" hint:SETTING_HINT_CLUSTER],
[SettingItem buildString:SETTING_ADDRESS val:@"wss://speech-maliva.bytedance.com" hint:SETTING_HINT_ADDRESS],
[SettingItem buildString:SETTING_URI val:@"/api/v1/sauc_test" hint:SETTING_HINT_URI],
......
ios/Classes/VoiceAsr.h
......@@ -17,11 +17,12 @@ NS_ASSUME_NONNULL_BEGIN
@interface VoiceAsr : NSObject
- (instancetype)initWithDelegate:(id<VoiceAsrDelegate>)delegate;
- (instancetype)initWithDelegate:(id<VoiceAsrDelegate>)delegate
config:(NSDictionary *)config;
+ (void)prepareEnvironment:(NSDictionary *)config;
- (void)initEngine;
- (void)initEngineWithConfig:(NSDictionary *)config;
- (void)uninitEngine;
......
ios/Classes/VoiceAsr.m
......@@ -38,6 +38,8 @@
@property (nonatomic, weak) id<VoiceAsrDelegate> delegate;
@property (strong, nonatomic) NSDictionary *config;
@end
......@@ -45,13 +47,15 @@
@implementation VoiceAsr
- (instancetype)init {
return [self initWithDelegate:nil];
return [self initWithDelegate:nil config:@{}];
}
- (instancetype)initWithDelegate:(id<VoiceAsrDelegate>)delegate {
- (instancetype)initWithDelegate:(id<VoiceAsrDelegate>)delegate
config:(NSDictionary *)config {
self = [super init];
if (self) {
self.delegate = delegate;
self.config = config;
self.streamRecorder = [[StreamRecorder alloc] init];
self.settings = [SettingsHelper shareInstance].asrSettings;
}
......@@ -68,7 +72,7 @@
NSString *appId = config[@"appId"];
if (status) {
SpeechResourceManager *speechResourceManager = [SpeechResourceManager shareInstance];
[speechResourceManager setAppId:SDEF_APPID];
[speechResourceManager setAppId:appId];
[speechResourceManager setAppVersion:@"1.0.0"];
// [speechResourceManager setDeviceId:self.deviceID];
[speechResourceManager setRootPath: [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:@"models"]];
......@@ -77,6 +81,11 @@
}
}
- (void)initEngineWithConfig:(NSDictionary *)config {
self.config = config;
[self initEngine];
}
- (void)startEngineBtnClicked {
[self setResultText:@""];
......@@ -189,11 +198,12 @@
[self.curEngine setStringParam:uri forKey:SE_PARAMS_KEY_ASR_URI_STRING];
NSString* appID = [self.settings getString:SETTING_APPID];
//【必需配置】鉴权相关：Appid
[self.curEngine setStringParam:appID.length <= 0 ? SDEF_APPID : appID forKey:SE_PARAMS_KEY_APP_ID_STRING];
[self.curEngine setStringParam:appID.length <= 0 ? self.config[@"appId"] : appID forKey:SE_PARAMS_KEY_APP_ID_STRING];
//【必需配置】鉴权相关：Token
NSString* token = [self.settings getString:SETTING_TOKEN];
[self.curEngine setStringParam:token forKey:SE_PARAMS_KEY_APP_TOKEN_STRING];
// NSString* token = [self.settings getString:SETTING_TOKEN];
[self.curEngine setStringParam:self.config[@"token"] forKey:SE_PARAMS_KEY_APP_TOKEN_STRING];
NSString* cluster = [self.settings getString:SETTING_CLUSTER];
NSLog(@"Current cluster: %@", cluster);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论