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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
董宏宇
2020-11-02 16:16:41 +08:00
parent 866f919eb2 be95baf109
commit 2fb027a159
43 changed files with 177 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
View File

@@ -28,6 +28,7 @@ import com.mogo.module.v2x.scenario.scene.road.V2XRoadVideoWindow;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.module.v2x.utils.SpanUtils;
import com.mogo.module.v2x.view.HeartLikeView;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -69,7 +70,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
private ImageView ivEventCallChart;
private ImageView ivEventReportTrue;
private ImageView ivEventReportErr;
private ImageView ivEventZan;
private HeartLikeView ivEventZan;
// 上传事件的用户信息
@@ -273,7 +274,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
ivEventCallChart.setVisibility(GONE);
triggerCallChart(mNoveltyInfo);
});
ivEventZan.setOnClickListener(v -> {
ivEventZan.setOnClickCallListener(v -> {
triggerZan(mNoveltyInfo);
});

10
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
View File

@@ -1,8 +1,11 @@
package com.mogo.module.v2x.utils;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.marker.PoiWrapper;
import com.mogo.module.common.utils.CloudPoiManager;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.utils.logger.Logger;
/**
* @ProjectName: MoGoModulSafeDriving
@@ -18,6 +21,13 @@ import com.mogo.module.v2x.voice.V2XVoiceConstants;
*/
public class EventTypeUtils {
public static String getPoiTypeStr(String poiType) {
// 先获取网络配置的poi对应的名称
PoiWrapper wrapper = CloudPoiManager.getInstance().getWrapperByPoiType(poiType);
if (wrapper != null) {
Logger.d("EventTypeUtils", "从配置表中拿到了相关数据： " + wrapper.getTitle());
return wrapper.getTitle();
}
// 如果获取不到，那么就用本地默认的
String str = "其它道路事件";
switch (poiType) {
// 停车场