From e1abee79448a12b1ed6b1501a3499cd648de864c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Aug 2020 14:01:58 +0800 Subject: [PATCH 1/2] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f3910bfae4..7c999263e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.1.24 # 车聊聊 -CARCHATTING_VERSION=1.4.8 +CARCHATTING_VERSION=1.4.9 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 From e05805d78e1b9c59e4a1ee0fa9934ce49526f4af Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 12 Aug 2020 14:02:25 +0800 Subject: [PATCH 2/2] opt --- .../java/com/mogo/module/v2x/V2XServiceManager.java | 10 ++++++++++ .../module/v2x/scenario/impl/V2XScenarioManager.java | 4 +++- .../v2x/scenario/scene/road/V2XRoadEventScenario.java | 5 +++++ .../res/drawable/bg_v2x_event_surrounding_item.xml | 6 ++++++ .../layout/module_event_panel_fragment_surrounding.xml | 2 +- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index ce10423148..3dd852c6c7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -31,6 +31,7 @@ import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoRefreshStrategyController; +import com.mogo.service.tanlu.IMogoTanluProvider; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoWindowManager; import com.zhidao.carchattingprovider.CallChattingProviderConstant; @@ -66,6 +67,7 @@ public class V2XServiceManager { private static IMogoRefreshStrategyController mIMogoRefreshStrategyController; private static IMogoMarkerService mIMogoMarkerService; private static IMogoShareManager mIMogoShareManager; + private static IMogoTanluProvider mIMogoTanluProvider; private static IMogoActionManager mMogoActionManager; private static ICarsChattingProvider mCarsChattingProvider; @@ -105,6 +107,7 @@ public class V2XServiceManager { mIMogoSearchManager = mMogoServiceApis.getSearchManagerApi(); mIMogoMarkerService = mMogoServiceApis.getMarkerService(); mIMogoShareManager = mMogoServiceApis.getShareManager(); + mIMogoTanluProvider = mMogoServiceApis.getTanluApi(); mMarkerManager = mMapService.getMarkerManager(context); mNavi = mMapService.getNavi(context); @@ -250,4 +253,11 @@ public class V2XServiceManager { public static IMogoShareManager getMogoShareManager() { return mIMogoShareManager; } + + public static IMogoTanluProvider getTanluManager() { + return mIMogoTanluProvider; + } + + + } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index 888fd9088c..029ffe5284 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -5,7 +5,10 @@ import android.content.Intent; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.mogo.module.common.entity.V2XMessageEntity; +import com.mogo.module.common.entity.V2XRoadEventEntity; +import com.mogo.module.service.carinfo.CarStateInfo; import com.mogo.module.v2x.V2XConst; +import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.IV2XScenarioManager; import com.mogo.module.v2x.scenario.scene.animation.V2XAnimationScenario; import com.mogo.module.v2x.scenario.scene.fatigue.V2XFatigueDrivingScenario; @@ -66,7 +69,6 @@ public class V2XScenarioManager implements IV2XScenarioManager { LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); - // 如果没有拿到之前的，根据类型分发 if (mV2XScenario == null) { switch (v2XMessageEntity.getType()) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index 754dc46370..ec404c9b60 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -5,6 +5,7 @@ import android.view.ViewGroup; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; +import com.mogo.module.service.ServiceConst; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; @@ -57,6 +58,10 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent(); if (v2XRoadEventEntity != null) { + //上报路况 + V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); + V2XServiceManager.getTanluManager().uploadRoadCondition(v2XRoadEventEntity.getPoiType()); + if (v2XMessageEntity.isShowState()) { if (!isSameScenario(v2XMessageEntity)) { // 更新要提醒的数据 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml new file mode 100644 index 0000000000..b92c805da1 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 2c65afb955..d46a797d3d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -4,7 +4,7 @@ android:id="@+id/clPanelContainer" android:layout_width="642px" android:layout_height="532px" - android:background="@color/surrounding_card_background"> + android:background="@drawable/bg_v2x_event_surrounding_item">