Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/widget/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<author email=""> </author>
<icon src="icon.png"/>
<license href=""/>
<content encoding="utf-8" src="index.html"/>
<content encoding="utf-8" src="uexXunfei.html"/>
<updateurl/>
<logserverip/>
<showmyspace>false</showmyspace>
Expand Down
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@ repositories {
}
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile ('org.appcan:engine:+:systemRelease@aar')
// compile ('org.appcan:engine:+:systemRelease@aar')
compile(name: 'Engine-system-release', ext: 'aar')
compile 'com.android.support:multidex:1.0.0'
}
android {
compileSdkVersion 22
buildToolsVersion "23.0.0"
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
}
lintOptions {
abortOnError false
}
Expand Down
125 changes: 85 additions & 40 deletions src/org/zywx/wbpalmstar/plugin/uexxunfei/EUExXunfei.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package org.zywx.wbpalmstar.plugin.uexxunfei;

import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Message;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.text.TextUtils;
import android.widget.Toast;

import com.iflytek.cloud.InitListener;
import com.iflytek.cloud.RecognizerListener;
Expand All @@ -16,6 +21,7 @@
import com.iflytek.cloud.SynthesizerListener;

import org.zywx.wbpalmstar.engine.DataHelper;
import org.zywx.wbpalmstar.engine.EBrowserActivity;
import org.zywx.wbpalmstar.engine.EBrowserView;
import org.zywx.wbpalmstar.engine.universalex.EUExBase;
import org.zywx.wbpalmstar.engine.universalex.EUExCallback;
Expand All @@ -39,6 +45,7 @@ public class EUExXunfei extends EUExBase {
private static final int MSG_INIT_SPEAKER = 2;

private String mCallbackWinName="root";
private String[] initSpeakerParams;

public EUExXunfei(Context context, EBrowserView eBrowserView) {
super(context, eBrowserView);
Expand Down Expand Up @@ -75,7 +82,6 @@ public void init(String[] params) {
} else {
callBackPluginJs(JsConst.CALLBACK_INIT, DataHelper.gson.toJson(outputVO));
}

}

private void initMsg(String[] params) {
Expand All @@ -91,13 +97,21 @@ private void initMsg(String[] params) {
}

public void initSpeaker(String[] params) {
Message msg = new Message();
msg.obj = this;
msg.what = MSG_INIT_SPEAKER;
Bundle bd = new Bundle();
bd.putStringArray(BUNDLE_DATA, params);
msg.setData(bd);
mHandler.sendMessage(msg);
initSpeakerParams = params;
// android6.0以上动态权限申请
if (mContext.checkCallingOrSelfPermission(Manifest.permission.RECORD_AUDIO)
!= PackageManager.PERMISSION_GRANTED){
requsetPerssions(Manifest.permission.RECORD_AUDIO, "请先申请权限"
+ Manifest.permission.RECORD_AUDIO, 1);
} else {
Message msg = new Message();
msg.obj = this;
msg.what = MSG_INIT_SPEAKER;
Bundle bd = new Bundle();
bd.putStringArray(BUNDLE_DATA, initSpeakerParams);
msg.setData(bd);
mHandler.sendMessage(msg);
}
}

private void initSpeakerMsg(String[] params) {
Expand Down Expand Up @@ -127,7 +141,6 @@ public void onInit(int i) {
//保存在SD卡需要在AndroidManifest.xml添加写SD卡权限
//如果不需要保存合成音频,注释该行代码
//mTts.setParameter(SpeechConstant.TTS_AUDIO_PATH, "./sdcard/iflytek.pcm");

}

@Override
Expand All @@ -154,47 +167,52 @@ public void onHandleMessage(Message message) {
* @param params
*/
public void startSpeaking(String[] params) {
if (mTts == null) {
return;
}
String json = params[0];
StartSpeakingVO speakingVO = DataHelper.gson.fromJson(json, StartSpeakingVO.class);
mTts.startSpeaking(speakingVO.text, new SynthesizerListener() {
@Override
public void onSpeakBegin() {
callBackPluginJs(JsConst.ON_SPEAK_BEGIN, "");
if (mContext.checkCallingOrSelfPermission(Manifest.permission.RECORD_AUDIO)
== PackageManager.PERMISSION_GRANTED){
if (mTts == null) {
return;
}
String json = params[0];
StartSpeakingVO speakingVO = DataHelper.gson.fromJson(json, StartSpeakingVO.class);
mTts.startSpeaking(speakingVO.text, new SynthesizerListener() {
@Override
public void onSpeakBegin() {
callBackPluginJs(JsConst.ON_SPEAK_BEGIN, "");
}

@Override
public void onBufferProgress(int i, int i1, int i2, String s) {
@Override
public void onBufferProgress(int i, int i1, int i2, String s) {

}
}

@Override
public void onSpeakPaused() {
callBackPluginJs(JsConst.ON_SPEAK_PAUSED, "");
}
@Override
public void onSpeakPaused() {
callBackPluginJs(JsConst.ON_SPEAK_PAUSED, "");
}

@Override
public void onSpeakResumed() {
callBackPluginJs(JsConst.ON_SPEAK_RESUMED, "");
}
@Override
public void onSpeakResumed() {
callBackPluginJs(JsConst.ON_SPEAK_RESUMED, "");
}

@Override
public void onSpeakProgress(int i, int i1, int i2) {
@Override
public void onSpeakProgress(int i, int i1, int i2) {

}
}

@Override
public void onCompleted(SpeechError speechError) {
callBackPluginJs(JsConst.ON_SPEAK_COMPLETE, "");
}
@Override
public void onCompleted(SpeechError speechError) {
callBackPluginJs(JsConst.ON_SPEAK_COMPLETE, "");
}

@Override
public void onEvent(int i, int i1, int i2, Bundle bundle) {
@Override
public void onEvent(int i, int i1, int i2, Bundle bundle) {

}
});
}
});
} else {
Toast.makeText(mContext, "请先申请权限" + Manifest.permission.RECORD_AUDIO, Toast.LENGTH_LONG).show();
}
}

public void initRecognizer(String[] params) {
Expand Down Expand Up @@ -305,4 +323,31 @@ private void callBackPluginJs(String methodName, String jsonData) {
evaluateScript(mCallbackWinName,0,js);
}

@Override
public void onRequestPermissionResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionResult(requestCode, permissions, grantResults);
if (requestCode == 1){
if (grantResults[0] != PackageManager.PERMISSION_DENIED){
Message msg = new Message();
msg.obj = this;
msg.what = MSG_INIT_SPEAKER;
Bundle bd = new Bundle();
bd.putStringArray(BUNDLE_DATA, initSpeakerParams);
msg.setData(bd);
mHandler.sendMessage(msg);
} else {
// 对于 ActivityCompat.shouldShowRequestPermissionRationale
// 1:用户拒绝了该权限,没有勾选"不再提醒",此方法将返回true。
// 2:用户拒绝了该权限,有勾选"不再提醒",此方法将返回 false。
// 3:如果用户同意了权限,此方法返回false
// 拒绝了权限且勾选了"不再提醒"
if (!ActivityCompat.shouldShowRequestPermissionRationale((EBrowserActivity)mContext, permissions[0])) {
Toast.makeText(mContext, "请先设置权限" + permissions[0], Toast.LENGTH_LONG).show();
} else {
requsetPerssions(Manifest.permission.RECORD_AUDIO, "请先申请权限" + permissions[0], 1);
}
}
}
}

}
5 changes: 3 additions & 2 deletions uexXunfei/info.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<uexplugins>
<plugin
uexName="uexXunfei" version="4.0.0" build="0">
<info>0:科大讯飞语音插件</info>
uexName="uexXunfei" version="4.3.0" build="1">
<info>1:添加动态权限申请</info>
<bulid>0:科大讯飞语音插件</bulid>
</plugin>
</uexplugins>