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

Merge branch 'dev' into dev_custom_map

Browse Source
This commit is contained in:
wangcongtao
2020-07-29 11:22:23 +08:00
parent 7a8d9a8084 13685ba00a
commit cb7855272c
57 changed files with 385 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
View File

@@ -18,6 +18,7 @@ import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.SpanUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.service.imageloader.MogoImageView;
import com.mogo.utils.logger.Logger;
@@ -103,7 +104,7 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
if (infoBean != null) {
long time = entity.getCreateTime();
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
String eventDistance = String.format("距离%d m", entity.getDistance());
String eventDistance = String.format("%d", entity.getDistance());
String eventTime = String.format("%s发布求助信息", sdf.format(new Date(time)));
holder.initView(infoBean.getHeadImgUrl(), infoBean.getDisplayName(), eventDistance, eventTime);
}
@@ -191,6 +192,12 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
}
tvName.setText(name);
tvDistance.setText(distance);
SpanUtils.with(tvDistance)
.append("" + distance)
.setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80))
.append("M")
.setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30))
.create();
tvEventTime.setText(eventTime);
}
}

20
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
View File

@@ -1,9 +1,6 @@
package com.mogo.module.v2x.adapter.holder;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
@@ -15,14 +12,13 @@ import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.RoadConditionUtils;
import com.mogo.module.v2x.utils.ToastUtils;
import com.mogo.module.v2x.utils.TrackUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.utils.TipToast;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -84,7 +80,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_CHAT);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("用户信息异常");
TipToast.tip("用户信息异常");
}
delayedCloseWindow();
}
@@ -105,7 +101,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_REPORT_ERROR);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("路况信息异常");
TipToast.tip("路况信息异常");
}
delayedCloseWindow();
}
@@ -126,7 +122,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_REPORT_RIGHT);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("路况信息异常");
TipToast.tip("路况信息异常");
}
delayedCloseWindow();
}
@@ -150,7 +146,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_NAVI);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("路况信息异常");
TipToast.tip("路况信息异常");
}
delayedCloseWindow();
}
@@ -161,11 +157,7 @@ public abstract class V2XBaseViewHolder
* @param msg
*/
public void showTip(String msg) {
ToastUtils.setGravity(Gravity.CENTER, 0, 0);
View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
msgView.setText(msg);
ToastUtils.showCustomShort(toastView);
TipToast.tip(msg);
}
@Override

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

@@ -25,6 +25,7 @@ import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventWindow;
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.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -318,6 +319,7 @@ public class V2XRoadEventDetailVH extends V2XBaseViewHolder {
// 重新设置用户信息
mNoveltyInfo.setUserInfo(mUserInfo);
// 只有自研车机才会 有车聊聊通话
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
// 判断是否可以打电话
ChartingUtil.isCanCall(b -> {

37
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
View File

@@ -2,6 +2,7 @@ package com.mogo.module.v2x.listener;
import android.content.Context;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.MogoLatLng;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.location.MogoLocation;
@@ -11,14 +12,14 @@ import com.mogo.map.search.geo.MogoGeocodeResult;
import com.mogo.map.search.geo.MogoRegeocodeResult;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.service.Utils;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.alarm.V2XAlarmServer;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.service.Utils;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.alarm.V2XAlarmServer;
import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
import com.mogo.module.v2x.utils.ADASUtils;
@@ -126,21 +127,23 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
}
}
// 疲劳驾驶检测
V2XAlarmServer.getFatigueDrivingShow(location, drivingShowEntity -> {
Logger.i(V2XConst.MODULE_NAME, "疲劳驾驶POI查询结果为: " + GsonUtil.jsonFromObject(drivingShowEntity));
// 只有自研车机才有疲劳驾驶检测
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
V2XAlarmServer.getFatigueDrivingShow(location, drivingShowEntity -> {
Logger.i(V2XConst.MODULE_NAME, "疲劳驾驶POI查询结果为: " + GsonUtil.jsonFromObject(drivingShowEntity));
String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
trackWithType(V2XPoiTypeEnum.ALERT_FATIGUE_DRIVING, drivingShowEntity.getLon(), drivingShowEntity.getLat(), style);
String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
trackWithType(V2XPoiTypeEnum.ALERT_FATIGUE_DRIVING, drivingShowEntity.getLon(), drivingShowEntity.getLat(), style);
V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = new V2XMessageEntity<>();
v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING);
v2XMessageEntity.setContent(drivingShowEntity);
v2XMessageEntity.setShowState(drivingShowEntity.isShowWindow());
// 广播给ADAS Launcher
ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), drivingShowEntity);
V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
});
V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = new V2XMessageEntity<>();
v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING);
v2XMessageEntity.setContent(drivingShowEntity);
v2XMessageEntity.setShowState(drivingShowEntity.isShowWindow());
// 广播给ADAS Launcher
ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), drivingShowEntity);
V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
});
}
// 巡航处理
V2XRoadEventEntity v2XRoadEventEntity =

16
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
View File

@@ -1,20 +1,14 @@
package com.mogo.module.v2x.listener;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
import com.mogo.module.v2x.utils.ADASUtils;
import com.mogo.module.v2x.utils.MarkerUtils;
import com.mogo.module.v2x.utils.ToastUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
@@ -113,11 +107,7 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener<V2XPush
}
private void showTip(String msg) {
ToastUtils.setGravity(Gravity.CENTER, 0, 0);
View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
msgView.setText(msg);
ToastUtils.showCustomShort(toastView);
TipToast.tip(msg);
}
}

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
View File

@@ -46,6 +46,7 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager {
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
case V2XPoiTypeEnum.FOURS_BLOCK_UP:
case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
colors.add(0xFFFA8C34);
colors.add(0xFFBD6D36);
colors.add(0xFFFA8C34);

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
View File

@@ -4,9 +4,9 @@ import android.content.Context;
import android.graphics.Bitmap;
import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.v2x.R;
import java.util.ArrayList;
@@ -42,6 +42,7 @@ public class V2XMarkerAdapter {
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
case V2XPoiTypeEnum.FOURS_BLOCK_UP:
case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
bitmap = getV2XRoadEventMarkerView(
context,
alarmInfo,
@@ -66,6 +67,7 @@ public class V2XMarkerAdapter {
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
case V2XPoiTypeEnum.FOURS_BLOCK_UP:
case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo);
break;
default:

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
View File

@@ -69,6 +69,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
mTvAddress = findViewById(R.id.tvAddress);
mTvAddressDistance = findViewById(R.id.tvAddressDistance);
mIvToNav = findViewById(R.id.ivToNav);
V2XServiceManager.getMogoRegisterCenter().registerMogoNaviListener( "test", this );
mIvToNav.setOnClickListener(v -> startNavi());
}
@@ -97,9 +98,9 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
}
SpanUtils.with(mTvAddressDistance)
.append("" + (int) entity.getDistance())
.setFontSize(82)
.setFontSize((int) getResources().getDimension(R.dimen.dp_80))
.append("M")
.setFontSize(30)
.setFontSize((int) getResources().getDimension(R.dimen.dp_30))
.create();
countDownV2XEvent(entity);
}
@@ -118,6 +119,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
handlerV2XEvent.removeCallbacks(runnableV2XEvent);
runnableV2XEvent = null;
}
//移除窗体
V2XServiceManager
.getMogoTopViewManager()
@@ -155,6 +157,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
@Override
public void onCalculateSuccess() {
V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener( "test");
V2XServiceManager.getNavi().startNavi(true);
}

28
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
View File

@@ -94,6 +94,20 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
showWindow();
}
// 地图主动推送/触发消息 埋点
String poiType = mV2XMessageEntity.getContent().getPoiType();
String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
Map<String, Object> properties = new HashMap<>();
properties.put("dbid", infoId);
properties.put("type", poiType);
properties.put("lng", lon);
properties.put("lat", lat);
properties.put("style", style);
V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
}
}
@@ -128,19 +142,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, true);
}
// 地图主动推送/触发消息 埋点
String poiType = mV2XMessageEntity.getContent().getPoiType();
String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
Map<String, Object> properties = new HashMap<>();
properties.put("dbid", infoId);
properties.put("type", poiType);
properties.put("lng", lon);
properties.put("lat", lat);
properties.put("style", style);
V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
}
@Override

13
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
View File

@@ -1,15 +1,10 @@
package com.mogo.module.v2x.utils;
import android.content.Intent;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.mogo.commons.voice.AIAssist;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -92,10 +87,6 @@ public class RoadConditionUtils {
*/
private static void showTip() {
AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已反馈", null);
ToastUtils.setGravity(Gravity.CENTER, 0, 0);
View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
msgView.setText("已反馈");
ToastUtils.showCustomShort(toastView);
TipToast.tip("已反馈");
}
}

8
modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
View File

@@ -4,13 +4,13 @@
android:duration="100"
android:propertyName="translationX"
android:valueFrom="0"
android:valueTo="-2"
android:valueTo="-5"
android:valueType="floatType" />
<objectAnimator
android:duration="100"
android:propertyName="translationX"
android:valueFrom="-2"
android:valueFrom="-5"
android:valueTo="0"
android:valueType="floatType" />
@@ -18,13 +18,13 @@
android:duration="100"
android:propertyName="translationX"
android:valueFrom="0"
android:valueTo="2"
android:valueTo="5"
android:valueType="floatType" />
<objectAnimator
android:duration="100"
android:propertyName="translationX"
android:valueFrom="2"
android:valueFrom="5"
android:valueTo="0"
android:valueType="floatType" />

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

5
modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:startColor="#ff3a435e"
android:endColor="#ff525b7b"
android:startColor="#3F4057"
android:endColor="#3F4057"
android:type="linear"
android:useLevel="true" />
</shape>

4
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
View File

@@ -8,7 +8,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.module.v2x.view.RoundLayout
android:id="@+id/rlRoadEventImg"
@@ -18,7 +18,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivEventImg"

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="#3D4053"
android:gravity="center"
app:roundLayoutRadius="@dimen/dp_30"
app:roundLayoutRadius="@dimen/dp_40"
tools:layout_height="@dimen/dp_382">
<ImageView

88
modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
View File

@@ -5,74 +5,42 @@
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
android:background="@drawable/v2x_fault_help_bg"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40">
<LinearLayout
android:id="@+id/llFaultHelpTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/v2x_gas_station_title_bg"
android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
app:layout_constraintVertical_chainStyle="packed">
<ImageView
android:id="@+id/ivImgTextIcon"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_30"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:src="@drawable/v2x_icon_fault_help_warn" />
<TextView
android:id="@+id/tvImgTextContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_7"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_26"
android:layout_marginBottom="@dimen/dp_6"
android:text="求助信息"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24" />
</LinearLayout>
<ImageView
android:id="@+id/ivNavIcon"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_29"
android:src="@drawable/v2x_icon_help_navi"
app:layout_constraintStart_toStartOf="@id/llFaultHelpTitle"
app:layout_constraintTop_toBottomOf="@id/llFaultHelpTitle" />
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_40">
<TextView
android:id="@+id/tvFaultHelpDistance"
android:id="@+id/tvImgTextContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_46"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_7"
android:layout_marginBottom="@dimen/dp_6"
android:background="@drawable/bg_v2x_event_type_orange"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_13"
android:paddingTop="@dimen/dp_5"
android:paddingEnd="@dimen/dp_13"
android:paddingBottom="@dimen/dp_5"
android:text="求助信息"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24"
app:layout_constraintBottom_toBottomOf="@+id/ivNavIcon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ivNavIcon"
tools:text="距离 300m" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivFaultHelpHead"
android:layout_width="@dimen/dp_128"
android:layout_height="@dimen/dp_128"
android:layout_width="@dimen/dp_108"
android:layout_height="@dimen/dp_108"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_31"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
app:layout_constraintStart_toEndOf="@+id/llFaultHelpTitle"
app:layout_constraintStart_toEndOf="@+id/tvImgTextContent"
app:layout_constraintTop_toTopOf="parent"
app:miv_borderColor="#4cffffff"
app:miv_failureHolder="@drawable/icon_default_user_head"
@@ -109,11 +77,25 @@
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
tools:text="15:30发布求助信息" />
<TextView
android:id="@+id/tvFaultHelpDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:gravity="center_vertical"
android:textColor="#FFF"
android:textSize="@dimen/dp_80"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
tools:text="300M" />
<ImageView
android:id="@+id/ivFaultHelpEventCall"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_40"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
View File

@@ -13,7 +13,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30" />
app:roundLayoutRadius="@dimen/dp_40" />
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivReportHead"

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
View File

@@ -12,7 +12,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivImg"

1
modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml
View File

@@ -10,6 +10,5 @@
android:id="@+id/ivIllegalParkingLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_heart_like" />
</LinearLayout>

1
modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
View File

@@ -10,7 +10,6 @@
android:id="@+id/ivIllegalParkingUnLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_heart_unlike" />
</LinearLayout>

2
modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height"
android:background="@color/live_video_background_color"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/txcVideoView"

2
modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_30"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.module.v2x.view.TextureVideoView
android:id="@+id/vvCarAnimation"

10
modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
View File

@@ -7,12 +7,13 @@
android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
android:background="@color/live_video_background_color"
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<ImageView
android:id="@+id/ivIconP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:src="@drawable/icon_parking_p"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -22,6 +23,8 @@
android:id="@+id/ivIconPIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:src="@drawable/icon_parting_icon"
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
@@ -32,6 +35,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_20"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
@@ -45,10 +49,10 @@
android:id="@+id/tvAddressDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_30"
android:gravity="center_vertical"
android:textColor="#FFF"
android:textSize="@dimen/dp_86"
android:textSize="@dimen/dp_80"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
app:layout_constraintEnd_toStartOf="@+id/ivToNav"

10
modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
View File

@@ -8,7 +8,7 @@
android:background="@color/live_video_background_color"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<ImageView
android:id="@+id/ivIconP"
@@ -23,7 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_23"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
android:paddingLeft="@dimen/dp_10"
@@ -35,7 +34,7 @@
android:textSize="@dimen/dp_24"
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@+id/ivIconP" />
<TextView
android:id="@+id/tvAddress"
@@ -44,7 +43,7 @@
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="2"
android:maxLines="1"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34"
app:layout_constraintBottom_toTopOf="@+id/tvAddressDistance"
@@ -63,7 +62,6 @@
android:gravity="center_vertical"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_30"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
app:layout_constraintStart_toStartOf="@+id/ivIconPIcon"
app:layout_constraintTop_toBottomOf="@+id/tvAddress"
@@ -73,7 +71,7 @@
android:id="@+id/llIllegalParkingLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
app:layout_constraintTop_toTopOf="parent" />

6
modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
View File

@@ -14,9 +14,11 @@
"zoom": true,
"zoomScale": 15,
"location": {
"lat": 39.9554100000,
"lon": 116.4178276100
"lat": 39.951326,
"lon": 116.343487
},
"lat": 39.951326,
"lon": 116.343487,
"userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
"msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"
}

4
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -8,11 +8,11 @@
<dimen name="module_v2x_event_window_height_ground">450px</dimen>
<dimen name="module_v2x_push_img_height">390px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">210px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
<dimen name="module_v2x_event_icon_size">160px</dimen>
<dimen name="module_v2x_event_button_size">90px</dimen>
<dimen name="module_v2x_event_button_size">110px</dimen>
<dimen name="module_v2x_event_button_size_detail">100px</dimen>
<dimen name="module_v2x_event_image_height">270px</dimen>

2
modules/mogo-module-v2x/src/main/res/values/color.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="live_video_progress_bar_loading_color">#256BFF</color>
<color name="live_video_background_color">#FF3F4057</color>
<color name="live_video_background_color">#3F4057</color>
</resources>