gaozl
/
Container_iot_custom_kdxf4.7
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: ci

dejiAi
高志龙 8 months ago
parent
39d4b27007
commit
1494c62ab4
1 changed files with 7 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java

15
app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
View File

@ -661,7 +661,6 @@ public class WebViewActivity extends BaseActivity {
LoggerUtil.e(TAG,"JS调用了Android的方法:startRecord()"); LoggerUtil.e(TAG,"JS调用了Android的方法:startRecord()");
try{ try{
if("sbc".equals(Constant.TTSFac)) { if("sbc".equals(Constant.TTSFac)) {
if (localSocketClient == null) initLocalSocketClient(); //-------------------------------
localSocketClient.send(StringUtil.strSplice("{\"method\":\"/tts/stop\"}")); localSocketClient.send(StringUtil.strSplice("{\"method\":\"/tts/stop\"}"));
localSocketClient.send(StringUtil.strSplice("{\"method\":\"/asr/start\"}")); localSocketClient.send(StringUtil.strSplice("{\"method\":\"/asr/start\"}"));
}else{ }else{
@ -697,7 +696,6 @@ public class WebViewActivity extends BaseActivity {
LoggerUtil.e(TAG,"JS调用了Android的方法:stopRecord()"); LoggerUtil.e(TAG,"JS调用了Android的方法:stopRecord()");
try{ try{
if("sbc".equals(Constant.TTSFac)) { if("sbc".equals(Constant.TTSFac)) {
if (localSocketClient == null) initLocalSocketClient(); //-------------------------------
localSocketClient.send(StringUtil.strSplice("{\"method\":\"/asr/stop\"}")); localSocketClient.send(StringUtil.strSplice("{\"method\":\"/asr/stop\"}"));
}else{ }else{
stopAsr(); stopAsr();
@ -713,7 +711,7 @@ public class WebViewActivity extends BaseActivity {
LoggerUtil.e(TAG,"JS调用了Android的方法:startTTS()"); LoggerUtil.e(TAG,"JS调用了Android的方法:startTTS()");
try{ try{
if("sbc".equals(Constant.TTSFac)) { if("sbc".equals(Constant.TTSFac)) {
if (localSocketClient == null) initLocalSocketClient(); //-------------------------------
if (localSocketClient == null) connectLocalSocket(); //-------------------------------
localSocketClient.send(StringUtil.strSplice("{\"method\": \"/tts/start\",\"params\": {\"text\":\"", txt, "\", \"mode\":\"autoPlay\"}}")); localSocketClient.send(StringUtil.strSplice("{\"method\": \"/tts/start\",\"params\": {\"text\":\"", txt, "\", \"mode\":\"autoPlay\"}}"));
}else{ }else{
ttsUtil.startTTs(txt); ttsUtil.startTTs(txt);
@ -728,7 +726,7 @@ public class WebViewActivity extends BaseActivity {
LoggerUtil.e(TAG,"JS调用了Android的方法:stopTTS()"); LoggerUtil.e(TAG,"JS调用了Android的方法:stopTTS()");
try{ try{
if("sbc".equals(Constant.TTSFac)){ if("sbc".equals(Constant.TTSFac)){
if (localSocketClient == null) initLocalSocketClient(); //-------------------------------
if (localSocketClient == null) connectLocalSocket(); //-------------------------------
localSocketClient.send(StringUtil.strSplice("{\"method\":\"/tts/stop\"}")); localSocketClient.send(StringUtil.strSplice("{\"method\":\"/tts/stop\"}"));
}else{ }else{
ttsUtil.stopTTs(); ttsUtil.stopTTs();
@ -853,7 +851,7 @@ public class WebViewActivity extends BaseActivity {
@Override @Override
public void onEndOfSpeech() { public void onEndOfSpeech() {
Log.d(TAG, "结束说话");
LoggerUtil.e("onEndOfSpeech:", "window.youAskOver('');");
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -915,7 +913,7 @@ public class WebViewActivity extends BaseActivity {
localSocketClient.reconnect(); localSocketClient.reconnect();
} }
} catch (Throwable t) { } catch (Throwable t) {
LoggerUtil.e("connectLocalSocket", StringUtil.getThrowableStr(t));
LoggerUtil.e("connectLocalSocket: Throwable", StringUtil.getThrowableStr(t));
destroyLocalSocketClient(); destroyLocalSocketClient();
} }
} }
@ -961,6 +959,7 @@ public class WebViewActivity extends BaseActivity {
}); });
} }
}else if("hardware.status".equals(method)){ // 网络变化 }else if("hardware.status".equals(method)){ // 网络变化
LoggerUtil.e("ttsSocket: hardware.status", content.getNetwork().trim());
if("lan".equals(content.getNetwork().trim())) { // 网络断开 if("lan".equals(content.getNetwork().trim())) { // 网络断开
destroyLocalSocketClient(); destroyLocalSocketClient();
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@ -971,7 +970,7 @@ public class WebViewActivity extends BaseActivity {
}); });
}else{ }else{
destroyLocalSocketClient(); destroyLocalSocketClient();
initLocalSocketClient();
connectLocalSocket();
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -988,7 +987,7 @@ public class WebViewActivity extends BaseActivity {
localSocketClient.setOnCloseListener((code, reason, remote) -> { localSocketClient.setOnCloseListener((code, reason, remote) -> {
LoggerUtil.e("LocSocCliManager", "onClose:code="+code); LoggerUtil.e("LocSocCliManager", "onClose:code="+code);
destroyLocalSocketClient(); destroyLocalSocketClient();
initLocalSocketClient();
connectLocalSocket();
}); });
localSocketClient.setOnErrorListener((ex) -> { localSocketClient.setOnErrorListener((ex) -> {
LoggerUtil.e("LocSocCliManager", "onError"); LoggerUtil.e("LocSocCliManager", "onError");

Write Preview
Loading…
Cancel
Save