From 1106ec5572744a33bfd13481d7fe6d57e2845840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 12 Aug 2020 11:57:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BA=86=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E7=9A=84=E6=9C=AA?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B6=88=E6=81=AF=E7=9A=84=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../module/v2x/fragment/V2XEventPanelFragment.kt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 6251025693..597d96cc7f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -120,11 +120,11 @@ class V2XEventPanelFragment : MvpFragment Date: Wed, 12 Aug 2020 12:29:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/item_v2x_scennario_history_other_help.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 16f6583eaa..5f194d1383 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -102,10 +102,9 @@ android:textColor="#FFF" android:textSize="@dimen/dp_80" android:textStyle="bold" - app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" + app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime" app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall" app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime" - app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall" tools:text="300M" /> Date: Wed, 12 Aug 2020 13:54:38 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/item_v2x_scennario_history_other_help.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 5f194d1383..b0e638cd58 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -69,7 +69,7 @@ android:layout_marginStart="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_30" android:textColor="@android:color/white" - android:textSize="@dimen/dp_34" + android:textSize="@dimen/dp_33" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance" app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead" @@ -82,11 +82,12 @@ android:id="@+id/tvFaultHelpEventTime" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_30" android:layout_marginBottom="@dimen/dp_24" android:alpha="0.59" android:textColor="@android:color/white" - android:textSize="@dimen/dp_30" + android:textSize="@dimen/dp_29" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance" app:layout_constraintStart_toStartOf="@id/tvFaultHelpName" From e1abee79448a12b1ed6b1501a3499cd648de864c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Aug 2020 14:01:58 +0800 Subject: [PATCH 4/8] 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 5/8] 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"> Date: Wed, 12 Aug 2020 14:29:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/utils/V2XSQLiteUtils.java | 23 ++++++++++++++++--- .../res/raw/scenario_road_event_data.json | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java index 1ace54ff86..ddb0fa2a5e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java @@ -76,6 +76,13 @@ public class V2XSQLiteUtils { return getScenarioHistoryDao().query(new V2XHistoryScenarioData(), "triggerTime", true); } + /** + * 查询当天的指定的V2X数据 + */ + public static List getTargetScenarioHistoryData(V2XHistoryScenarioData scenarioData) { + return getScenarioHistoryDao().query(scenarioData, "triggerTime", true); + } + /** * 查询当天的未评价V2X数据 */ @@ -99,7 +106,7 @@ public class V2XSQLiteUtils { } /** - * 存储本地数据 + * 存储本地数据，每个数据只能存在一次，所以存储之前先查询数据库如果已经存在则修改触碰时间 * * @param markerExploreWay 要存储的场景 */ @@ -108,10 +115,20 @@ public class V2XSQLiteUtils { // 进行数据库存储 V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData(); v2XHistoryScenarioData.setScenarioType(scenarioType); - v2XHistoryScenarioData.setTriggerTime(TimeUtils.getNowMills()); v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(markerExploreWay)); + + List historyScenarioData = getTargetScenarioHistoryData(v2XHistoryScenarioData); + + v2XHistoryScenarioData.setTriggerTime(TimeUtils.getNowMills()); v2XHistoryScenarioData.setDispose(false); - V2XSQLiteUtils.getScenarioHistoryDao().insert(v2XHistoryScenarioData); + + if (historyScenarioData != null && historyScenarioData.size() > 0) { + // 更新数据 + V2XSQLiteUtils.getScenarioHistoryDao().update(historyScenarioData.get(0), v2XHistoryScenarioData); + } else { + // 存储新数据 + V2XSQLiteUtils.getScenarioHistoryDao().insert(v2XHistoryScenarioData); + } V2XEventPanelFragment.Companion.getInstance().changeEventCount(); } catch (Exception e) { e.printStackTrace(); diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json index aa04f0d43c..651a0e65b0 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json @@ -16,7 +16,7 @@ "distance":670, "fileType":1, "generateTime":1593587904096, - "infoId":"727905963169587200", + "infoId":"72790596316958720000", "items":[ { "illegalCount":0, From 84d1a155f75691ddb1f3dfe8c788d2ad761170ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 12 Aug 2020 14:57:07 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=A7=A6=E5=8F=91=E8=BF=9D=E7=AB=A0=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E7=9A=84=E6=97=B6=E5=80=99=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=84=E4=BB=B7=E8=BF=9B=E8=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E4=B8=BA=E5=B7=B2=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/V2XHistoryScenarioData.java | 11 +++++++++++ .../java/com/mogo/module/v2x/V2XConst.java | 2 +- .../v2x/adapter/holder/V2XIllegalParkVH.java | 8 ++++++++ .../V2XScenarioHistoryOtherSeekHelpVH.java | 6 ------ .../mogo/module/v2x/utils/V2XSQLiteUtils.java | 19 +++++++++++++++++++ .../item_v2x_scennario_history_other_help.xml | 4 +++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java index 87093e57b9..53f5250437 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java @@ -1,5 +1,6 @@ package com.mogo.module.common.entity; +import com.mogo.map.location.MogoLocation; import com.mogo.utils.sqlite.annotation.DbDatabase; import com.mogo.utils.sqlite.annotation.DbField; import com.mogo.utils.sqlite.annotation.DbTable; @@ -68,4 +69,14 @@ public class V2XHistoryScenarioData { public void setDispose(Boolean dispose) { isDispose = dispose; } + + @Override + public V2XHistoryScenarioData clone() throws CloneNotSupportedException { + try { + return (V2XHistoryScenarioData) super.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + return this; + } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index 4ae6aa6541..bb79de34e4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -59,7 +59,7 @@ public class V2XConst { */ public static final String V2X_ROAD_SHOW = "v2x_road_show"; public static final String V2X_ROAD_EVET = "v2x_road_event"; - public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button"; + public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click"; /** * V2X 道路事件操作类型 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java index 22ee1d2379..806981ef15 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java @@ -7,17 +7,21 @@ import android.widget.TextView; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; +import com.mogo.module.common.entity.V2XHistoryScenarioData; +import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario; import com.mogo.module.v2x.utils.RoadConditionUtils; +import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.module.v2x.view.HeartLikeView; import com.mogo.module.v2x.view.HeartUnLikeView; import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -101,6 +105,10 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { */ @Override public void delayedCloseWindow() { + V2XHistoryScenarioData v2XHistoryScenarioData =new V2XHistoryScenarioData(); + v2XHistoryScenarioData.setScenarioType(V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING); + v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(mExploreWay)); + V2XSQLiteUtils.updateScenarioHistoryDataIsDispose(v2XHistoryScenarioData); itemView.postDelayed(() -> V2XIllegalParkScenario.getInstance().close(), 1000); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java index 1f42c55f26..e729e747b3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java @@ -73,12 +73,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder + app:layout_constraintTop_toTopOf="@+id/tagEventType" + tools:visibility="visible" /> Date: Wed, 12 Aug 2020 15:02:18 +0800 Subject: [PATCH 8/8] add showbound --- .../mogo/module/v2x/V2XServiceManager.java | 1 - .../v2x/fragment/V2XEventPanelFragment.kt | 2 +- ...gment.java => V2XSurroundingFragment.java} | 71 +++++++++++++++++-- .../src/main/res/values-xhdpi/dimens.xml | 5 ++ .../src/main/res/values/dimens.xml | 4 ++ 5 files changed, 77 insertions(+), 6 deletions(-) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/{SurroundingEventFragment.java => V2XSurroundingFragment.java} (78%) 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 3dd852c6c7..9aac886249 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 @@ -55,7 +55,6 @@ public class V2XServiceManager { private static IMogoLocationClient mMogoLocationClient; private static IMogoGeoSearch mIMogoGeoSearch; private static IMogoSearchManager mIMogoSearchManager; - private static IMogoTopViewManager mMogoTopViewManager; private static IMogoStatusManager mMogoStatusManager; private static IMogoWindowManager mIMogoWindowManager; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 597d96cc7f..3542bee411 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -48,7 +48,7 @@ class V2XEventPanelFragment : MvpFragment implements SurroundingEventView, +public class V2XSurroundingFragment extends MvpFragment implements SurroundingEventView, View.OnClickListener, SurroundingItemClickListener { private static final String TAG = "SurroundingFragment"; private RecyclerView mRecyclerView; @@ -193,9 +196,6 @@ public class SurroundingEventFragment extends MvpFragment exploreWayList) { + Logger.e(TAG, "showBonndsRoadtion exploreWayList.size() = " + exploreWayList.size()); + Rect rect = new Rect( + (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_left), + (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_top), + (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_right), + (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_bottom)); + + moveNotFresh(); + //第一个参数：调用者,第二个参数：当前自车的位置,第三个参数：需要显示在范围内的点（不包含自车的位置） + //第四个参数：显示范围的UI边界,第五个参数：是否锁定自车位置（看业务需要） + V2XServiceManager.getMapUIController().showBounds(ServiceConst.CARD_TYPE_ROAD_CONDITION, null, getMogoList(exploreWayList), rect, false); + } + + private void moveNotFresh() { + V2XServiceManager.getMoGoStatusManager().setUserInteractionStatus(TAG, true, false); + } + + /** + * 构造经纬度列表 + * + * @return + */ + private List getMogoList(List markerExploreWayList) { + List list = new ArrayList<>(); + if (markerExploreWayList != null && markerExploreWayList.size() > 0) { + if (markerExploreWayList.size() < 6) { + for (int i = 0; i < markerExploreWayList.size(); i++) { + MarkerLocation location = markerExploreWayList.get(i).getLocation(); + if (location != null) { + MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon()); + list.add(mogoLatLng); + } else { + Logger.e(TAG, "getMogoList() < 6 location == null"); + } + } + } else { + for (int i = 0; i < 6; i++) { + MarkerLocation location = markerExploreWayList.get(i).getLocation(); + if (location != null) { + MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon()); + list.add(mogoLatLng); + } else { + Logger.e(TAG, "getMogoList() location == null"); + } + } + } + } else { + Logger.e(TAG, "getMogoList() markerExploreWay == null"); + } + return list; + } + + @Override public void onDestroy() { super.onDestroy(); diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index a534085c47..a7a1f0b66f 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -25,4 +25,9 @@ 80px 6px + 550px + 200px + 200px + 100px + diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index bd225eb0a4..12bbc42e11 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -26,5 +26,9 @@ 40px 6px 16px + 550px + 200px + 200px + 100px