diff --git a/app/src/main/java/cn/EasertnDay/HuaZai/LauncherActivity.java b/app/src/main/java/cn/EasertnDay/HuaZai/LauncherActivity.java
index ea16d32fb1dd7e4e542d38c885c45c0e129213b0..8884a0953f0820bc9123a385bb99ec9cd2e1b7af 100644
--- a/app/src/main/java/cn/EasertnDay/HuaZai/LauncherActivity.java
+++ b/app/src/main/java/cn/EasertnDay/HuaZai/LauncherActivity.java
@@ -371,9 +371,12 @@ public class LauncherActivity extends AppCompatActivity implements IAsrResultLis
if (event == AsrEvent.ASR_EVENT_WAKEUP_RESULT) {
beeper.startTone(ToneGenerator.TONE_DTMF_S, 30);
if (SdkParam.getInstance().getAudioSourceType() == AudioSourceType.JNI) {
- unisoundAsrEngine.startAsr(false);
+ Intent myIntent = new Intent(context, VoicePage.class);
+ startActivity(myIntent);
+ //unisoundAsrEngine.startAsr(false);
}
}
+ /*
if (event == AsrEvent.ASR_EVENT_ASR_RESULT) {
try {
JSONObject jsonObject = new JSONObject(result);
@@ -411,14 +414,12 @@ public class LauncherActivity extends AppCompatActivity implements IAsrResultLis
}
unisoundAsrEngine.startWakeUp();
unisoundAsrEngine.startAsr(false);
- /*
else if (result.contains("nlu")) {
//Log.d("我带你们打", "返回结果1: " + result);
Say.setText(result);
unisoundAsrEngine.startWakeUp();
unisoundAsrEngine.startAsr(false);
}
- */
}
@Override
@@ -431,6 +432,7 @@ public class LauncherActivity extends AppCompatActivity implements IAsrResultLis
unisoundAsrEngine.startWakeUp();
}
}
+ */
}
@Override
diff --git a/app/src/main/java/cn/EasertnDay/HuaZai/SecondaryPage/VoicePage.java b/app/src/main/java/cn/EasertnDay/HuaZai/SecondaryPage/VoicePage.java
index 4dac227e8e7bc689f0f766c6c55fea2fa7eaf3fe..7ed6e8bf11bb8927b9d3ad3e972263cb21f56d18 100644
--- a/app/src/main/java/cn/EasertnDay/HuaZai/SecondaryPage/VoicePage.java
+++ b/app/src/main/java/cn/EasertnDay/HuaZai/SecondaryPage/VoicePage.java
@@ -3,6 +3,7 @@ package cn.EasertnDay.HuaZai.SecondaryPage;
import android.app.Activity;
import android.content.Intent;
import android.content.res.AssetManager;
+import android.media.AudioManager;
import android.media.ToneGenerator;
import android.os.*;
import android.support.v7.app.AppCompatActivity;
@@ -65,16 +66,20 @@ public class VoicePage extends AppCompatActivity implements IAsrResultListener {
Ans = findViewById(R.id.AnwserText);
WebView webView = findViewById(R.id.WebView);
- webView.loadUrl("baidu.com");
- webView.setWebViewClient(new WebViewClient() {
- //设置在webView点击打开的新网页在当前界面显示,而不跳转到新的浏览器中
+ webView.loadUrl("http://baidu.com");
+ //覆盖WebView默认使用第三方或系统默认浏览器打开网页的行为,使网页用WebView打开
+ webView.setWebViewClient(new WebViewClient(){
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
- view.loadUrl("baidu.com");
+ // TODO Auto-generated method stub
+ //返回值是true的时候控制去WebView打开,为false调用系统浏览器或第三方浏览器
+ view.loadUrl(url);
return true;
}
});
+ //哔声发声器
+ beeper = new ToneGenerator(AudioManager.STREAM_ALARM, 100);
//语音
unisoundAsrEngine = VoicePresenter.getInstance().getUnisoundAsrEngine();
VoicePresenter.getInstance().setAsrListener((IAsrResultListener) context);
@@ -103,6 +108,12 @@ public class VoicePage extends AppCompatActivity implements IAsrResultListener {
@Override
public void onResult(int event, String result) {
+ if (event == AsrEvent.ASR_EVENT_WAKEUP_RESULT) {
+ beeper.startTone(ToneGenerator.TONE_DTMF_S, 30);
+ if (SdkParam.getInstance().getAudioSourceType() == AudioSourceType.JNI) {
+ unisoundAsrEngine.startAsr(false);
+ }
+ }
if (event == AsrEvent.ASR_EVENT_ASR_RESULT) {
try {
JSONObject jsonObject = new JSONObject(result);
diff --git a/app/src/main/res/drawable/img_duihuakuang.png b/app/src/main/res/drawable/img_duihuakuang.png
index 690c625b1119ab7ab830f08947550d56df5b3651..7f33068673cc5b19d929ed622e02ff52d0a88d50 100644
Binary files a/app/src/main/res/drawable/img_duihuakuang.png and b/app/src/main/res/drawable/img_duihuakuang.png differ
diff --git a/app/src/main/res/drawable/test_zstp.png b/app/src/main/res/drawable/test_zstp.png
deleted file mode 100644
index cc48e7d2818342ebfc63c1fac1e25f6999e54b9a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/test_zstp.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_voice_page.xml b/app/src/main/res/layout/activity_voice_page.xml
index 6886b519f60f78f519b03cb460625d39d811a0ef..f365bcbe9183ec81703a07b0280eb7a2c728536c 100644
--- a/app/src/main/res/layout/activity_voice_page.xml
+++ b/app/src/main/res/layout/activity_voice_page.xml
@@ -67,6 +67,7 @@
android:layout_marginStart="50dp"/>