Merge branch 'qa_1.1.8' into dev

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
This commit is contained in:
董宏宇
2020-12-01 14:53:19 +08:00
10 changed files with 57 additions and 24 deletions

View File

@@ -198,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
spannableString.setSpan(new StyleSpan(Typeface.BOLD), 7,
originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTotalTv.setText(spannableString);
ttsForSurroundingFirstToday(exploreWayList.size());
} else {
mTopLayout.setVisibility(View.GONE);
mRecyclerView.setVisibility(View.GONE);
@@ -207,19 +209,19 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
ttsForVoiceCheckout();
fromVoice = false;
}
ttsForSurroundingFirstToday();
}
/*
/**
* 手动点击周边事件 TTS播报
* */
private void ttsForSurroundingFirstToday() {
*/
private void ttsForSurroundingFirstToday(int eventCount) {
boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_SURROUNDING_SELECTED");
if (hasBroadTts == false) {
if (poiInfosList.size() > 0) {
if (!hasBroadTts) {
if (eventCount > 0) {
AIAssist.getInstance(V2XUtils.getApp()).
speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null);
speakTTSVoice("发现周边" + eventCount + "条交通信息", null);
} else {
Logger.e(TAG,"周边没有发现交通信息");
}
}
}