From 1b29794d30b9574acba004634a72273812a11cd5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Sep 2020 20:05:30 +0800 Subject: [PATCH 1/3] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4b0613d6ae..741d0b3c42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -101,7 +101,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.2 +CARCHATTING_VERSION=1.8.4 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib From a3e2bd0e445805bc71d61c538f2b72a89e08bb23 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Sep 2020 20:22:48 +0800 Subject: [PATCH 2/3] fix bug --- .../com/mogo/module/guide/fragment/GuideFragment.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index 5d4054afdc..77779ede91 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -10,6 +10,7 @@ import com.mogo.module.guide.util.AnalyticsUtil import com.mogo.module.guide.util.AnalyticsUtil.INVOKE_TRACK_PASS_TIME import com.mogo.module.guide.util.AnalyticsUtil.INVOKE_TRACK_PLAY_PASS_ID import com.mogo.module.guide.util.AnalyticsUtil.INVOKE_TRACK_PLAY_TIME +import com.mogo.module.guide.util.breakOffSpeak import com.mogo.module.guide.util.speak import com.mogo.utils.logger.Logger import com.zhpan.indicator.enums.IndicatorSlideMode @@ -104,11 +105,6 @@ class GuideFragment : MvpFragment(), GuideC } private fun destroy() { - speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_end), object : IMogoVoiceCmdCallBack { - override fun onTTSEnd(ttsId: String?, tts: String?) { - - } - }) GuideBizManager.removeGuideFragmentToStack() } @@ -124,6 +120,12 @@ class GuideFragment : MvpFragment(), GuideC override fun onDestroy() { super.onDestroy() track() + breakOffSpeak(context!!) + speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_end), object : IMogoVoiceCmdCallBack { + override fun onTTSEnd(ttsId: String?, tts: String?) { + + } + }) invokeAuthorize() } } \ No newline at end of file From afe5a4acb43c23eee588fa68124ce0a651b62464 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 25 Sep 2020 20:45:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=9D=E6=8C=81=E6=8E=A2=E8=B7=AF?= =?UTF-8?q?=E5=8E=9F=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tanlu/fragment/TanluListWindow.java | 67 ++++++++++++------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index 3b93ac53d5..f4a18ccc8d 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -369,24 +369,15 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL mMogoRegisterCenter.registerMogoMarkerClickListener(TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() { @Override public boolean onMarkerClicked(IMogoMarker marker) { - + GSYVideoManager.releaseAllVideos(); + initVideo(); + releaseTimer(); + //埋点 + Map properties = new HashMap<>(); + properties.put("type", "2"); + mAnalytics.track(TanluConstants.LAUNCHER_ICON_CLICK, properties); //点击的marker的具体数据 MarkerExploreWay exploreWay = extractFromMarker(marker); - V2XRoadEventEntity roadEventEntity = new V2XRoadEventEntity(); - roadEventEntity.setNoveltyInfo(exploreWay); - roadEventEntity.setPoiType(exploreWay.getPoiType()); - roadEventEntity.setExpireTime(20000); - //地理位置 - MarkerLocation location = exploreWay.getLocation(); - roadEventEntity.setLocation(location); - - V2XMessageEntity v2XMessageEntity = new V2XMessageEntity(); - v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING); - v2XMessageEntity.setShowState(true); - v2XMessageEntity.setOnlyShow(true); - v2XMessageEntity.setNeedAddLine(false); - - v2XMessageEntity.setContent(roadEventEntity); //更新数据 if (markerExploreWayList != null) { markerExploreWayList.clear(); @@ -395,20 +386,48 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL } markerExploreWayList.add(exploreWay); - Intent intent = new Intent(Const.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(Const.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); + boolean isAdd = TanluServiceManager.getIMogoTopViewManager().isViewAdded(TanluListWindow.this); + hideWindowTimerStart(); + Logger.d(TAG, "onMarkerClicked ------ isAdd = " + isAdd); - //埋点 - Map properties = new HashMap<>(); - properties.put("type", "2"); - mAnalytics.track(TanluConstants.LAUNCHER_ICON_CLICK, properties); + //添加window窗口,重复创建 + if (!isAdd) { + ViewGroup.LayoutParams layoutParams = + new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + (int) getContext().getResources().getDimension((R.dimen.tanlu_module_card_height))); + TanluServiceManager.getIMogoTopViewManager().addView(TanluListWindow.this, layoutParams, new IMogoTopViewStatusListener() { + @Override + public void onViewAdded(View view) { + Logger.d(TAG, "onViewAdded -------->"); + } + + @Override + public void onViewRemoved(View view) { + Logger.e(TAG, "onViewRemoved -------->"); + releaseTimer(); + releaseAction(); + } + + @Override + public void beforeViewAddAnim(View view) { + + } + + @Override + public void beforeViewRemoveAnim(View view) { + + } + }); + + } + + renderCardViews(); return false; } }); } - private CountDownTimer mHideWindowTimer; private void hideWindowTimerStart() {