From 68ce0466b0df7ca0ffd91edb379f5b18d966c06b Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 14:57:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF-UI?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml | 5 +++++ modules/mogo-module-main/src/main/res/values/dimens.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index 99b72ae3db..327e0c3010 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -31,4 +31,9 @@ 1920px 0px + + 2px + 2px + 6px + 6px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 89a3dc55f4..7662141351 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -33,6 +33,6 @@ 2px 2px - 6px - 6px + 2px + 4px \ No newline at end of file From 8fadd5e4d904b6e3269eb973d58d30977a189081 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 15:43:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=AD=90=E7=B1=BBtts=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/V2XSurroundingAdapter.java | 2 + .../entity/panel/SurroundingConstruction.java | 38 +++++++++++++++++++ .../v2x/fragment/V2XSurroundingFragment.java | 7 +++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index fa111adadc..9514f894ce 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -10,11 +10,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.v2x.R; import com.mogo.module.v2x.adapter.holder.V2XSurroundingViewHolder; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; +import com.mogo.module.v2x.utils.V2XUtils; import java.util.List; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java index c52d204fb0..2cd7c87742 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java @@ -1,6 +1,7 @@ package com.mogo.module.v2x.entity.panel; import com.mogo.module.common.entity.MarkerExploreWay; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; import java.io.Serializable; import java.util.ArrayList; @@ -35,4 +36,41 @@ public class SurroundingConstruction implements Serializable { public void addMarkerExploreWay(MarkerExploreWay item) { construtList.add(item); } + + public String getTypeNameTTS(String type) { + String typeName = "请查看周边的"; + switch (type) { + case MarkerPoiTypeEnum.ROAD_CLOSED: + typeName += "封路"; + break; + case MarkerPoiTypeEnum.FOURS_ICE: + typeName += "道路结冰"; + break; + case MarkerPoiTypeEnum.FOURS_FOG: + typeName += "浓雾"; + break; + case MarkerPoiTypeEnum.TRAFFIC_CHECK: + typeName += "交通检查"; + break; + case MarkerPoiTypeEnum.FOURS_ACCIDENT: + typeName += "交通事故"; + break; + case MarkerPoiTypeEnum.FOURS_BLOCK_UP: + typeName += "拥堵"; + break; + case MarkerPoiTypeEnum.FOURS_ROAD_WORK: + typeName += "施工"; + break; + case MarkerPoiTypeEnum.FOURS_PONDING: + typeName += "道路积水"; + break; + case MarkerPoiTypeEnum.FOURS_LIVING: + typeName += "实时路况"; + break; + default: + typeName += "实时路况"; + break; + } + return typeName + "信息"; + } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 58ee3fa1a9..571707afcb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -34,6 +34,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.anim.OnMarkerAnimationListener; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerLocation; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.ServiceConst; import com.mogo.module.v2x.R; @@ -382,10 +383,14 @@ public class V2XSurroundingFragment extends MvpFragment