Commit e77f3a74 by cuiliang.shi

BUG #50220 【图灵】退出小P时,提示小P已停止运行(附LOG和截图)

BUG #50225 【图灵】小P讲故事时来电,来电和通话声音与后台小P讲故事声音同时存在
1 parent b05534a6
...@@ -962,7 +962,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -962,7 +962,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
operateAll(); operateAll();
} }
}); });
try{
mGlobalDialog.show(); mGlobalDialog.show();
}catch (Exception e){
Log.d(TAG, e.toString());
}
} else { } else {
handleMyTips(getString(R.string.app_name) + "没听清,请再说一遍吧"); handleMyTips(getString(R.string.app_name) + "没听清,请再说一遍吧");
...@@ -1322,23 +1326,34 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -1322,23 +1326,34 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
protected void onDestroy() { protected void onDestroy() {
Log.d(TAG, "onDestroy"); Log.d(TAG, "onDestroy");
super.onDestroy(); super.onDestroy();
if (mLoginSuccess) { // if (mLoginSuccess) {
exitLogic(); exitLogic();
// }
} }
@Override
protected void onPause() {
AsrManager.getInstance().stop();
TTSManager.getInstance().stopTTS();
playView.setChecked(false);
TuringMusic.getInstance().stop();
super.onPause();
} }
public void exitLogic() { public void exitLogic() {
if (AsrManager.getInstance() != null && AsrManager.getInstance().isRecording()) { // if (AsrManager.getInstance() != null && AsrManager.getInstance().isRecording()) {
AsrManager.getInstance().cancel(); AsrManager.getInstance().cancel();
} // }
if (TTSManager.getInstance() != null && TTSManager.getInstance().isSpeaking()) { // if (TTSManager.getInstance() != null && TTSManager.getInstance().isSpeaking()) {
TTSManager.getInstance().stopTTS(); TTSManager.getInstance().stopTTS();
} // }
if (TuringMusic.getInstance() != null &&TuringMusic.getInstance().isPlaying()) { // if (TuringMusic.getInstance() != null &&TuringMusic.getInstance().isPlaying()) {
playViewWrapper.setVisibility(View.GONE); playViewWrapper.setVisibility(View.GONE);
playView.setChecked(false); playView.setChecked(false);
TuringMusic.getInstance().stop(); TuringMusic.getInstance().stop();
} // }
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!