yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qa_1.1.8' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_1.1.8

Browse Source
This commit is contained in:
wangcongtao
2020-11-26 16:39:14 +08:00
parent ebc4ec4403 8fadd5e4d9
commit 84d1cc23c3
5 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
View File

@@ -31,4 +31,9 @@
<dimen name="module_ext_top_view_max_width">1920px</dimen>
<dimen name="module_main_panel_margin_right">0px</dimen>
<!--事件面板-->
<dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingLeft">6px</dimen>
<dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
</resources>

4
modules/mogo-module-main/src/main/res/values/dimens.xml
View File

@@ -33,6 +33,6 @@
<!--事件面板-->
<dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingLeft">6px</dimen>
<dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
<dimen name="module_main_event_panel_fragment_paddingLeft">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingRight">4px</dimen>
</resources>

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
View File

@@ -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;

38
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java
View File

@@ -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 + "信息";
}
}

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
View File

@@ -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<SurroundingEventView, Su
e.printStackTrace();
}
}
/*
* 子类信息tts播报
* */
AIAssist.getInstance(V2XUtils.getApp()).
speakTTSVoice(construction.getTypeNameTTS(construction.getPoiType()), null);
}
}
/**
* 自适应显示
*