From 1f7e9ac17e473be2d67e049ea856ca21eefb4378 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 6 Nov 2020 21:23:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[fix]=E6=9A=82=E5=81=9C=E8=BD=AC=E5=9C=88?= =?UTF-8?q?=E5=9C=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/view/SimpleCoverVideoPlayer.kt | 12 ++++++------ .../res/layout/v2x_road_video_plyer_layout.xml | 17 +++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt index 3d2697ed9e..be83a6236d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt @@ -83,12 +83,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { } override fun updateStartImage() { -// super.updateStartImage() -// -// when (mCurrentState) { -// GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE -// else -> start.visibility = View.INVISIBLE -// } + super.updateStartImage() + + when (mCurrentState) { + GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE + else -> start.visibility = View.INVISIBLE + } } fun setFullClickListener(listener: OnClickListener) { diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml index 61ff05d18a..d706253444 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml @@ -71,13 +71,14 @@ //加载中圈圈 - + + From 5e3338b9eab09c180961858538e15f0cf1bc62cc Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 8 Nov 2020 19:28:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=B2=E5=8F=96=E6=B6=88=20=20=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java index 54ba834788..c032668c54 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java @@ -68,7 +68,7 @@ public class V2XSeekHelpButton implements IV2XButton { @Override public void close() { if (tv != null) { - AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("将为您取消", null); + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消", null); tv.setVisibility(View.GONE); V2XServiceManager.getV2XRefreshModel().cancelHelpSignal(new V2XRefreshCallback() { @Override From d40437d81a06f7a4d837083374b4bdb49f366b7d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 9 Nov 2020 10:35:50 +0800 Subject: [PATCH 3/3] fixed bug --- .../java/com/mogo/module/share/TanluManager.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index c569c45d27..7aaf538804 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -290,7 +290,11 @@ public class TanluManager implements IMogoMarkerClickListener, @Override public void onQueryRoadInfoSuccess(@NotNull List roadInfoList) { if (roadInfoList == null || (roadInfoList != null && roadInfoList.size() <= 0)) { - speakFailVoice("未发现" + mKeywords + "附近的特殊路况"); + if (mKeywords.equals("附近")) { + speakFailVoice("未发现附近的特殊路况"); + } else { + speakFailVoice("未发现" + mKeywords + "附近的特殊路况"); + } moveToMarcker(currentLat, currentLon); return; } @@ -307,7 +311,11 @@ public class TanluManager implements IMogoMarkerClickListener, public void onQueryRoadInfoFail(@NotNull String msg, int code) { Logger.e(TAG, "onQueryRoadInfoFail ----- msg = " + msg); // speakFailVoice(searchfaileVoiceStrings[1]); - speakFailVoice("未发现" + mKeywords + "附近的特殊路况"); + if (mKeywords.equals("附近")) { + speakFailVoice("未发现附近的特殊路况"); + } else { + speakFailVoice("未发现" + mKeywords + "附近的特殊路况"); + } moveToMarcker(currentLat, currentLon); }