From f1fb8d6f3a3ff34371d2b0677a7dad0122bba886 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 11 Feb 2020 15:05:59 +0800 Subject: [PATCH 1/5] opt play voice --- .../com/mogo/module/tanlu/fragment/TanluCardViewFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 6a8b41add6..92dd6cd3ea 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -472,7 +472,8 @@ public class TanluCardViewFragment extends MvpFragment> public void onCmdSelected(String cmd) { Log.d(TAG, "mogoVoiceListener cmd = " + cmd); if (cmd.equals(TanluConstants.PLAY_VIDEO)) { //播放路况 --ok - AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_prepare_play), null); + //语音会中断播放 +// AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_prepare_play), null); gsyVideoOptionBuilder.setUrl(mVideoUrl).setCacheWithPlay(false).setPlayTag(TAG) .build(simpleCoverVideoPlayer); simpleCoverVideoPlayer.getStartButton().performClick(); From 72ce077c8c203ed8b086e108c0781a7a33eb2268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 11 Feb 2020 16:43:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【在线车辆】在线车辆，相同位置显示了两个车，其实只有一辆车也只有这辆车可以被选中 http://jira.zhidaohulian.com/projects/UI/issues/UI-140?filter=myopenissues 原因是因为之前说和在线车辆使用同样数据的车聊聊返回了数据导致同一个位置多个车辆绘制 --- .../service/marker/MapMarkerManager.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 98c8e1d520..1c255e42b3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -258,20 +258,20 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag List shareMusicList = markerCardResult.getShareMusic(); List noveltyInfoList = markerCardResult.getNoveltyInfo(); - if (carChatList != null) { - for (MarkerCarChat markerCarChat : carChatList) { - MarkerLocation markerLocation = markerCarChat.getLocation(); - - MarkerShowEntity markerShowEntity = new MarkerShowEntity(); - markerShowEntity.setBindObj(markerCarChat); - markerShowEntity.setMarkerLocation(markerLocation); - markerShowEntity.setMarkerType(markerCarChat.getType()); - markerShowEntity.setTextContent(markerCarChat.getUserInfo().getUserName()); - markerShowEntity.setIconUrl(markerCarChat.getUserInfo().getUserHead()); - - drawMapMarker(markerShowEntity); - } - } +// if (carChatList != null) { +// for (MarkerCarChat markerCarChat : carChatList) { +// MarkerLocation markerLocation = markerCarChat.getLocation(); +// +// MarkerShowEntity markerShowEntity = new MarkerShowEntity(); +// markerShowEntity.setBindObj(markerCarChat); +// markerShowEntity.setMarkerLocation(markerLocation); +// markerShowEntity.setMarkerType(markerCarChat.getType()); +// markerShowEntity.setTextContent(markerCarChat.getUserInfo().getUserName()); +// markerShowEntity.setIconUrl(markerCarChat.getUserInfo().getUserHead()); +// +// drawMapMarker(markerShowEntity); +// } +// } if (onlineCarList != null) { IMogoMarker nearlyMogoMarker = null; From d5a118d0f2573a1e4218798c9f2910cc6c3c9355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 11 Feb 2020 17:16:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E3=80=90ADAS?= =?UTF-8?q?=E3=80=91=E6=89=93=E5=BC=80=E8=BE=85=E5=8A=A9=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E4=BE=A7=E5=9C=B0=E5=9B=BE=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=93=E7=82=B9=E5=9C=B0=E5=9B=BE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=88=E5=85=A8=E9=83=A8=E8=BD=A6=E8=BE=86=EF=BC=8C?= =?UTF-8?q?=E5=8D=B1=E9=99=A9=E9=A9=BE=E9=A9=B6=E8=BD=A6=E8=BE=86=E8=BF=99?= =?UTF-8?q?=E4=BA=9B=E6=A0=87=E7=AD=BE=EF=BC=89=20http://jira.zhidaohulian?= =?UTF-8?q?.com/projects/UI/issues/UI-202=3Ffilter=3Dmyopenissues=20?= =?UTF-8?q?=E3=80=90ADAS=E3=80=91=E5=85=B3=E9=97=AD=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=8D=A1=E7=89=87=EF=BC=8C=E6=89=93=E7=82=B9?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=B2=A1=E6=9C=89=E9=9A=8F=E4=B9=8B=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=20http://jira.zhidaohulian.com/projects/UI/issues/UI-?= =?UTF-8?q?201=3Ffilter=3Dmyopenissues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MogoServiceProvider.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index b746efc98d..4c3a8a2525 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -523,6 +523,7 @@ public class MogoServiceProvider implements IMogoModuleProvider, @Override public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) { + Logger.d(TAG, "状态发生改变---descriptor---" + descriptor + "----isTrue---" + isTrue); switch ( descriptor ) { case USER_INTERACTED: if ( isTrue && !mRefreshRemainingTimeStatus ) { @@ -532,7 +533,6 @@ public class MogoServiceProvider implements IMogoModuleProvider, } break; case SEARCH_UI: - case V2X_UI: if ( isTrue ) { // 搜索时，不在自动刷新打点策略 stopAutoRefreshStrategy(); @@ -543,9 +543,33 @@ public class MogoServiceProvider implements IMogoModuleProvider, } } break; + case V2X_UI: + try { + if ( isTrue ) { + // V2X_UI时，不在自动刷新打点策略 + stopAutoRefreshStrategy(); + } else { + // 主动刷新 + refreshStrategy(); + // V2X_UI后，打开打点策略 + if ( mAutoRefreshCallback != null ) { + mAutoRefreshCallback.onSuccess(); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + break; } } + public void refreshStrategy(){ + Logger.d( TAG, "move to center and refresh data." ); + mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, false ); + mUiController.moveToCenter(mLastAutoRefreshLocation); + notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback ); + } + @Override public void onCalculateSuccess() { From ae01e7cfe14d5236b592c7c9090d3fe144c0da60 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Feb 2020 18:51:53 +0800 Subject: [PATCH 4/5] print the Glide Exception and style add windowFullScreen in Launcher.App --- .idea/gradle.xml | 1 + app/src/main/res/values/styles.xml | 1 + .../src/main/java/com/mogo/utils/glide/BaseGlideModule.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 26618df6e9..e8b50f2c1d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -19,6 +19,7 @@