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/adapter/holder/V2XBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
new file mode 100644
index 0000000000..d7c9aa2c4e
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
@@ -0,0 +1,210 @@
+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;
+
+import com.mogo.commons.voice.AIAssist;
+import com.mogo.map.MogoLatLng;
+import com.mogo.map.navi.IMogoNaviListener;
+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 static com.mogo.module.v2x.V2XConst.MODULE_NAME;
+
+/**
+ * V2X展示视图公用的实现
+ *
+ * @author donghongyu
+ */
+public abstract class V2XBaseViewHolder
+ extends RecyclerView.ViewHolder
+ implements IMogoNaviListener {
+
+ public V2XBaseViewHolder(@NonNull View itemView) {
+ super(itemView);
+ }
+
+ /**
+ * 延迟关闭窗体视图
+ */
+ public abstract void delayedCloseWindow();
+
+ /**
+ * 点赞
+ */
+ public void triggerZan(MarkerExploreWay noveltyInfo) {
+ try {
+ AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已点赞", null);
+ showTip("已点赞");
+ if (noveltyInfo != null) {
+ V2XServiceManager.getV2XMarkerService()
+ .getV2XRefreshModel()
+ .giveLikeLiveVideo(null, noveltyInfo.getSn());
+
+ TrackUtils.trackV2xRoadEvent(
+ noveltyInfo.getInfoId(),
+ noveltyInfo.getSn(),
+ V2XConst.V2X_ROAD_ZAN);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ delayedCloseWindow();
+ }
+
+ /**
+ * 打电话
+ */
+ public void triggerCallChart(MarkerExploreWay noveltyInfo) {
+ try {
+ MarkerLocation location = new MarkerLocation();
+ location.setLat(noveltyInfo.getLocation().getLat());
+ location.setLon(noveltyInfo.getLocation().getLon());
+
+ ChartingUtil.callChatting(noveltyInfo.getUserInfo(), location);
+
+ TrackUtils.trackV2xRoadEvent(
+ noveltyInfo.getInfoId(),
+ noveltyInfo.getSn(),
+ V2XConst.V2X_ROAD_CHAT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ ToastUtils.showShort("用户信息异常");
+ }
+ delayedCloseWindow();
+ }
+
+ /**
+ * 反馈路况错误
+ */
+ public void triggerReportErr(MarkerExploreWay noveltyInfo) {
+ try {
+ RoadConditionUtils.sendDataErrorReceiverInfo(
+ noveltyInfo.getPoiType(),
+ noveltyInfo.getInfoId(),
+ "1");
+
+ TrackUtils.trackV2xRoadEvent(
+ noveltyInfo.getInfoId(),
+ noveltyInfo.getSn(),
+ V2XConst.V2X_ROAD_REPORT_ERROR);
+ } catch (Exception e) {
+ e.printStackTrace();
+ ToastUtils.showShort("路况信息异常");
+ }
+ delayedCloseWindow();
+ }
+
+ /**
+ * 反馈路况正确
+ */
+ public void triggerReportTrue(MarkerExploreWay noveltyInfo) {
+ try {
+ RoadConditionUtils.sendDataErrorReceiverInfo(
+ noveltyInfo.getPoiType(),
+ noveltyInfo.getInfoId(),
+ "2");
+
+ TrackUtils.trackV2xRoadEvent(
+ noveltyInfo.getInfoId(),
+ noveltyInfo.getSn(),
+ V2XConst.V2X_ROAD_REPORT_RIGHT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ ToastUtils.showShort("路况信息异常");
+ }
+ delayedCloseWindow();
+ }
+
+ /**
+ * 导航规划路线
+ */
+ public void triggerStartNavi(MarkerExploreWay noveltyInfo) {
+ try {
+ MogoLatLng endPoint = new MogoLatLng(
+ noveltyInfo.getLocation().getLat(),
+ noveltyInfo.getLocation().getLon());
+
+ V2XServiceManager.getNavi().naviTo(endPoint);
+ V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener(MODULE_NAME);
+ V2XServiceManager.getMogoRegisterCenter().registerMogoNaviListener(MODULE_NAME, this);
+
+ TrackUtils.trackV2xRoadEvent(
+ noveltyInfo.getInfoId(),
+ noveltyInfo.getSn(),
+ V2XConst.V2X_ROAD_NAVI);
+ } catch (Exception e) {
+ e.printStackTrace();
+ ToastUtils.showShort("路况信息异常");
+ }
+ delayedCloseWindow();
+ }
+
+ /**
+ * 显示自定义 Toast
+ *
+ * @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);
+ }
+
+ @Override
+ public void onInitNaviFailure() {
+
+ }
+
+ @Override
+ public void onInitNaviSuccess() {
+
+ }
+
+ @Override
+ public void onNaviInfoUpdate(MogoNaviInfo naviinfo) {
+
+ }
+
+ @Override
+ public void onStartNavi() {
+
+ }
+
+ @Override
+ public void onStopNavi() {
+
+ }
+
+ @Override
+ public void onCalculateSuccess() {
+ V2XServiceManager.getNavi().startNavi(true);
+ }
+
+ @Override
+ public void onoCalculateFailed() {
+
+ }
+
+ @Override
+ public void onUpdateTraffic(MogoTraffic traffic) {
+
+ }
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XLiveVideoVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XLiveVideoVH.java
index 043fe6b31f..61dafb34ce 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XLiveVideoVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XLiveVideoVH.java
@@ -1,44 +1,19 @@
package com.mogo.module.v2x.adapter.holder;
-import android.content.Intent;
-import android.text.TextUtils;
-import android.view.Gravity;
import android.view.LayoutInflater;
-import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.voice.AIAssist;
import com.mogo.module.common.entity.MarkerCarInfo;
-import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerUserInfo;
import com.mogo.module.common.entity.V2XEventShowEntity;
+import com.mogo.module.common.entity.V2XLiveCarInfoEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.common.entity.V2XLiveCarInfoEntity;
-import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
-import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
-import com.mogo.module.v2x.utils.ChartingUtil;
-import com.mogo.module.v2x.utils.ToastUtils;
import com.mogo.module.v2x.utils.TrackUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.module.v2x.view.V2XLiveGSYVideoView;
-import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
-import com.mogo.module.v2x.voice.V2XVoiceConstants;
-import com.mogo.module.v2x.voice.V2XVoiceManager;
import com.mogo.service.imageloader.MogoImageView;
-import com.mogo.utils.logger.Logger;
-
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
* author : donghongyu
@@ -47,15 +22,11 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
* desc : 直播类型的卡片
* version: 1.0
*/
-public class V2XLiveVideoVH extends RecyclerView.ViewHolder {
+public class V2XLiveVideoVH extends V2XBaseViewHolder {
private V2XLiveGSYVideoView videoPlayer;
private MogoImageView ivReportHead;
- // 控制按钮
- private ImageView ivRoadCallChart;
- private ImageView ivRoadEventLike;
-
// 上传事件的用户信息
private MarkerUserInfo mUserInfo = new MarkerUserInfo();
// 直播车机数据
@@ -63,55 +34,10 @@ public class V2XLiveVideoVH extends RecyclerView.ViewHolder {
// 预警的道路事件数据
private V2XRoadEventEntity mV2XRoadEventEntity;
- // 拨打车聊聊语音回调
- private V2XVoiceCallbackListener v2XVoiceCallbackCallListener = new V2XVoiceCallbackListener() {
- @Override
- public void onCallback(String command, Intent intent) {
- if (mUserInfo != null && !TextUtils.isEmpty(mUserInfo.getSn())) {
- roadCallChart();
- }
- }
- };
- // 点赞语音回调
- private V2XVoiceCallbackListener v2XVoiceCallbackLickListener = new V2XVoiceCallbackListener() {
- @Override
- public void onCallback(String command, Intent intent) {
- if (mV2XLiveCarEntity != null) {
- handlerZan(mV2XLiveCarEntity.getSn());
- }
- }
- };
-
public V2XLiveVideoVH(ViewGroup viewGroup) {
super(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_live_video, viewGroup, false));
videoPlayer = itemView.findViewById(R.id.videoPlayer);
ivReportHead = itemView.findViewById(R.id.ivReportHead);
-
- ivRoadCallChart = itemView.findViewById(R.id.ivRoadCallChart);
- ivRoadEventLike = itemView.findViewById(R.id.ivRoadEventLike);
-
- // 设置视图状态监听
- itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
- @Override
- public void onViewAttachedToWindow(View v) {
- //Logger.w(MODULE_NAME, "列表View V2XLiveVideoVH 触发 onViewAttachedToWindow");
- // 注册语音交互
- V2XVoiceManager.INSTANCE
- .registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CALL_CHATTING,
- v2XVoiceCallbackCallListener)
- .registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_ZAN,
- v2XVoiceCallbackLickListener)
- .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP,
- v2XVoiceCallbackCallListener)
- .registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_ZAN_UN_WAKEUP,
- v2XVoiceCallbackLickListener);
- }
-
- @Override
- public void onViewDetachedFromWindow(View v) {
- //Logger.w(MODULE_NAME, "列表View V2XLiveVideoVH 触发 onViewDetachedFromWindow");
- }
- });
}
public void initView(V2XEventShowEntity v2XLiveCarEntity) {
@@ -126,119 +52,12 @@ public class V2XLiveVideoVH extends RecyclerView.ViewHolder {
MarkerCarInfo.CarLiveInfo carLiveInfo = new MarkerCarInfo.CarLiveInfo();
carLiveInfo.setVideoSn(v2XLiveCarEntity.getSn());
videoPlayer.setCarLiveInfo(carLiveInfo);
-
- ivRoadEventLike.setVisibility(VISIBLE);
-
- ivRoadCallChart.setOnClickListener(v -> {
- ivRoadCallChart.setVisibility(GONE);
- roadCallChart();
- });
- ivRoadEventLike.setOnClickListener(v -> {
- handlerZan(v2XLiveCarEntity.getSn());
- });
-
- requestUserInfo(v2XLiveCarEntity);
- }
-
- private void roadCallChart() {
- MarkerLocation location = new MarkerLocation();
- ChartingUtil.callChatting(mUserInfo, location);
- }
-
- /**
- * 请求用户信息
- *
- * @param v2XLiveCarEntity 直播信息
- */
- private void requestUserInfo(V2XLiveCarInfoEntity v2XLiveCarEntity) {
- Logger.d(MODULE_NAME, "上报事件的用户SN:" + v2XLiveCarEntity.getSn());
TrackUtils.trackV2xRoadEvent(mV2XRoadEventEntity.getNoveltyInfo().getInfoId(), v2XLiveCarEntity.getSn(), V2XConst.V2X_ROAD_VIDEO);
- // 获取道路事件周边的直播车机
- if (!TextUtils.isEmpty(v2XLiveCarEntity.getSn())) {
- V2XServiceManager
- .getV2XRefreshModel()
- .queryUserInfoBySn(
- v2XLiveCarEntity.getSn(),
- new V2XRefreshCallback() {
- @Override
- public void onSuccess(V2XUserInfoRes result) {
- //Logger.d(MODULE_NAME, "上报事件的用户:" + result);
- if (result != null &&
- result.getResult() != null &&
- result.getResult().getInfo() != null) {
- V2XUserInfoRes.Result.Info infoBean = result.getResult().getInfo();
- if (mUserInfo == null) {
- mUserInfo = new MarkerUserInfo();
- }
- mUserInfo.setSn(infoBean.getSn());
- try {
- if (!TextUtils.isEmpty(infoBean.getCardIdAge())) {
- mUserInfo.setAge(Integer.parseInt(infoBean.getCardIdAge()));
- }
- } catch (NumberFormatException e) {
- e.printStackTrace();
- }
- mUserInfo.setUserName(infoBean.getUserNickName());
- mUserInfo.setUserHead(infoBean.getHeadImgUrl());
- mUserInfo.setGender(infoBean.getCardIdSex());
-
- if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
- // 判断是否可以打电话
- ChartingUtil.isCanCall(b -> {
- if (b) {
- // 判断是否可以打电话
- ChartingUtil.isOnLine(mUserInfo.getSn(), b1 -> {
- if (b1) {
- ivRoadCallChart.setVisibility(VISIBLE);
- } else {
- ivRoadCallChart.setVisibility(GONE);
- }
- });
- } else {
- ivRoadCallChart.setVisibility(GONE);
- }
- });
-
- }
- if (!TextUtils.isEmpty(mUserInfo.getUserHead())) {
- V2XServiceManager.getImageLoader()
- .displayImage(mUserInfo.getUserHead(), ivReportHead);
- }
- }
- }
-
- @Override
- public void onFail(String msg) {
- ivRoadCallChart.setVisibility(GONE);
- }
- });
- }
}
- private void handlerZan(String sn) {
- try {
- AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已点赞", null);
- showTip("已点赞");
- V2XServiceManager.getV2XMarkerService()
- .getV2XRefreshModel()
- .giveLikeLiveVideo(null, sn);
- ivReportHead.postDelayed(new Runnable() {
- @Override
- public void run() {
- V2XRoadEventScenario.getInstance().close();
- }
- }, 2000);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- 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);
+ @Override
+ public void delayedCloseWindow() {
+ ivReportHead.postDelayed(() -> V2XRoadEventScenario.getInstance().close(), 2000);
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XPushEventDetailVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XPushEventDetailVH.java
index a4f8226297..c7d4ee87bf 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XPushEventDetailVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XPushEventDetailVH.java
@@ -1,30 +1,19 @@
package com.mogo.module.v2x.adapter.holder;
-import android.content.Intent;
import android.text.TextUtils;
-import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
-import com.mogo.map.navi.IMogoNaviListener;
-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.common.entity.MarkerUserInfo;
+import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.scenario.scene.push.V2XPushEventScenario;
import com.mogo.module.v2x.utils.ChartingUtil;
-import com.mogo.module.v2x.utils.ToastUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -40,7 +29,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
* desc : TODO 这里是前瞻演示需求,推送的消息,
* version: 1.0
*/
-public class V2XPushEventDetailVH extends RecyclerView.ViewHolder implements IMogoNaviListener {
+public class V2XPushEventDetailVH extends V2XBaseViewHolder {
private MogoImageView ivImg;
private MogoImageView ivReportHead;
@@ -55,28 +44,25 @@ public class V2XPushEventDetailVH extends RecyclerView.ViewHolder implements IMo
private MarkerUserInfo mUserInfo = new MarkerUserInfo();
private V2XPushMessageEntity mV2XRoadEventEntity;
+ private MarkerExploreWay mNoveltyInfo;
// 语音控制导航
- private V2XVoiceCallbackListener mNaviCb = new V2XVoiceCallbackListener() {
- @Override
- public void onCallback(String command, Intent intent) {
- startNavi();
- }
- };
+ private V2XVoiceCallbackListener mNaviCb = (command, intent) -> triggerStartNavi(mNoveltyInfo);
// 语音控制拨打电话
- private V2XVoiceCallbackListener mCallChartingCb = new V2XVoiceCallbackListener() {
- @Override
- public void onCallback(String command, Intent intent) {
- roadCallChart();
+ private V2XVoiceCallbackListener mCallChartingCb = (command, intent) -> {
+ try {
+ mUserInfo.setSn(mV2XRoadEventEntity.getSn());
+ mUserInfo.setUserHead(mV2XRoadEventEntity.getHeadImgUrl());
+ mUserInfo.setUserName("蘑菇用户");
+ mUserInfo.setGender("男");
+ mUserInfo.setAge(30);
+ triggerCallChart(mNoveltyInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
}
};
// 点赞语音回调
- private V2XVoiceCallbackListener v2XVoiceCallbackLickListener = new V2XVoiceCallbackListener() {
- @Override
- public void onCallback(String command, Intent intent) {
- handlerZan();
- }
- };
+ private V2XVoiceCallbackListener v2XVoiceCallbackLickListener = (command, intent) -> triggerZan(mNoveltyInfo);
public V2XPushEventDetailVH(ViewGroup viewGroup) {
super(LayoutInflater.from(viewGroup.getContext())
@@ -91,24 +77,20 @@ public class V2XPushEventDetailVH extends RecyclerView.ViewHolder implements IMo
ivRoadEventLike = itemView.findViewById(R.id.ivRoadEventLike);
ivRoadEventNav.getParent().getParent().requestDisallowInterceptTouchEvent(true);
- ivRoadEventNav.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- startNavi();
- }
- });
- ivRoadCallChart.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- roadCallChart();
- }
- });
- ivRoadEventLike.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- handlerZan();
+ ivRoadEventNav.setOnClickListener(v -> triggerStartNavi(mNoveltyInfo));
+ ivRoadCallChart.setOnClickListener(v -> {
+ try {
+ mUserInfo.setSn(mV2XRoadEventEntity.getSn());
+ mUserInfo.setUserHead(mV2XRoadEventEntity.getHeadImgUrl());
+ mUserInfo.setUserName("蘑菇用户");
+ mUserInfo.setGender("男");
+ mUserInfo.setAge(30);
+ triggerCallChart(mNoveltyInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
}
});
+ ivRoadEventLike.setOnClickListener(v -> triggerZan(mNoveltyInfo));
// 设置视图状态监听
itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@@ -153,6 +135,14 @@ public class V2XPushEventDetailVH extends RecyclerView.ViewHolder implements IMo
public void initView(V2XPushMessageEntity v2XRoadEventEntity) {
mV2XRoadEventEntity = v2XRoadEventEntity;
+ mNoveltyInfo = new MarkerExploreWay();
+ mNoveltyInfo.setSn(mV2XRoadEventEntity.getSn());
+ mNoveltyInfo.setInfoId(mV2XRoadEventEntity.getSceneId());
+ MarkerLocation location = new MarkerLocation();
+ location.setLat(mV2XRoadEventEntity.getLat());
+ location.setLon(mV2XRoadEventEntity.getLon());
+ mNoveltyInfo.setLocation(location);
+
if (!TextUtils.isEmpty(v2XRoadEventEntity.getMsgImgUrl())) {
V2XServiceManager.getImageLoader()
.displayImage(v2XRoadEventEntity.getMsgImgUrl(), ivImg);
@@ -170,7 +160,6 @@ public class V2XPushEventDetailVH extends RecyclerView.ViewHolder implements IMo
ivRoadReportTrue.setVisibility(View.GONE);
ivRoadReportErr.setVisibility(View.GONE);
ivRoadEventLike.setVisibility(View.GONE);
-
break;
case "100017"://政府公告
@@ -179,119 +168,16 @@ public class V2XPushEventDetailVH extends RecyclerView.ViewHolder implements IMo
ivRoadEventNav.setVisibility(View.GONE);
ivRoadReportTrue.setVisibility(View.GONE);
ivRoadReportErr.setVisibility(View.GONE);
-
break;
}
-
- }
-
- /**
- * 打电话
- */
- private void roadCallChart() {
- Logger.w(MODULE_NAME, "正在拨打电话。。。。");
- if (mV2XRoadEventEntity != null) {
- MarkerLocation location = new MarkerLocation();
- location.setLon(mV2XRoadEventEntity.getLon());
- location.setLat(mV2XRoadEventEntity.getLat());
- mUserInfo.setSn(mV2XRoadEventEntity.getSn());
- mUserInfo.setUserHead(mV2XRoadEventEntity.getHeadImgUrl());
- mUserInfo.setUserName("蘑菇用户");
- mUserInfo.setGender("男");
- mUserInfo.setAge(30);
- ChartingUtil.callChatting(mUserInfo, location);
- delayedCloseWindow();
- }
- }
-
- /**
- * 点赞
- */
- private void handlerZan() {
- try {
- AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已点赞", null);
- showTip("已点赞");
- if (mV2XRoadEventEntity != null) {
- V2XServiceManager.getV2XMarkerService()
- .getV2XRefreshModel()
- .giveLikeLiveVideo(null, mV2XRoadEventEntity.getSn());
- }
- delayedCloseWindow();
- } catch (Exception e) {
- e.printStackTrace();
- }
}
/**
* 延迟关闭窗体
*/
- private void delayedCloseWindow() {
- itemView.postDelayed(new Runnable() {
- @Override
- public void run() {
- V2XPushEventScenario.getInstance().close();
- }
- }, 1000);
- }
-
- /**
- * 导航规划路线
- */
- private void startNavi() {
- if (mV2XRoadEventEntity != null) {
- MogoLatLng endPoint = new MogoLatLng(mV2XRoadEventEntity.getLat(), mV2XRoadEventEntity.getLon());
- V2XServiceManager.getNavi().naviTo(endPoint);
- V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener(MODULE_NAME);
- V2XServiceManager.getMogoRegisterCenter().registerMogoNaviListener(MODULE_NAME, this);
- delayedCloseWindow();
- }
- }
-
- 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);
- }
-
@Override
- public void onCalculateSuccess() {
- V2XServiceManager.getNavi().startNavi(true);
+ public void delayedCloseWindow() {
+ itemView.postDelayed(() -> V2XPushEventScenario.getInstance().close(), 1000);
}
- @Override
- public void onInitNaviFailure() {
-
- }
-
- @Override
- public void onInitNaviSuccess() {
-
- }
-
- @Override
- public void onNaviInfoUpdate(MogoNaviInfo naviinfo) {
-
- }
-
- @Override
- public void onStartNavi() {
-
- }
-
- @Override
- public void onStopNavi() {
-
- }
-
- @Override
- public void onoCalculateFailed() {
-
- }
-
- @Override
- public void onUpdateTraffic(MogoTraffic traffic) {
-
- }
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
index 325cd4dcda..165f912f32 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
@@ -2,39 +2,29 @@ package com.mogo.module.v2x.adapter.holder;
import android.content.Intent;
import android.text.TextUtils;
-import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
-import androidx.recyclerview.widget.RecyclerView;
-
import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.voice.AIAssist;
import com.mogo.module.common.entity.MarkerExploreWay;
-import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerUserInfo;
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
import com.mogo.module.common.entity.V2XEventShowEntity;
import com.mogo.module.common.entity.V2XLiveCarInfoEntity;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.common.entity.V2XWindowTypeEnum;
+import com.mogo.module.v2x.R;
+import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.scenario.scene.livecar.V2XRoadLiveCarScenario;
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.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.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -46,9 +36,7 @@ import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;
import java.util.Calendar;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
@@ -61,7 +49,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
* desc : 道路事件详情
* version: 1.0
*/
-public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
+public class V2XRoadEventDetailVH extends V2XBaseViewHolder {
private MogoImageView ivEventImg;
private MogoImageView ivReportHead;
private ImageView ivEventPlay;
@@ -79,7 +67,7 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
// 上传事件的用户信息
- private MarkerUserInfo mUserInfo = new MarkerUserInfo();
+ private MarkerUserInfo mUserInfo;
// 当前的新鲜事儿信息
private MarkerExploreWay mNoveltyInfo;
private V2XRoadEventEntity mV2XRoadEventEntity;
@@ -89,28 +77,28 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
private V2XVoiceCallbackListener v2XVoiceCallbackCallListener = new V2XVoiceCallbackListener() {
@Override
public void onCallback(String command, Intent intent) {
- roadCallChart(mNoveltyInfo);
+ triggerCallChart(mNoveltyInfo);
}
};
// 点赞语音回调
private V2XVoiceCallbackListener v2XVoiceCallbackLickListener = new V2XVoiceCallbackListener() {
@Override
public void onCallback(String command, Intent intent) {
- handlerZan(mNoveltyInfo);
+ triggerZan(mNoveltyInfo);
}
};
// 反馈"正确"语音回调
private V2XVoiceCallbackListener v2XVoiceCallbackReportTrueListener = new V2XVoiceCallbackListener() {
@Override
public void onCallback(String command, Intent intent) {
- roadReportTrue(mNoveltyInfo);
+ triggerReportTrue(mNoveltyInfo);
}
};
// 反馈"错误"语音回调
private V2XVoiceCallbackListener v2XVoiceCallbackReportErrorListener = new V2XVoiceCallbackListener() {
@Override
public void onCallback(String command, Intent intent) {
- roadReportErr(mNoveltyInfo);
+ triggerReportErr(mNoveltyInfo);
}
};
// 反馈"错误"语音回调
@@ -174,12 +162,13 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
}
mV2XEventShowEntity = v2XEventShowEntity;
mV2XRoadEventEntity = v2XEventShowEntity.getV2XRoadEventEntity();
+
if (mV2XRoadEventEntity == null) {
return;
}
mNoveltyInfo = mV2XRoadEventEntity.getNoveltyInfo();
if (mNoveltyInfo != null) {
- //Logger.d(MODULE_NAME, "mContentData:" + mContentData);
+ mUserInfo = mNoveltyInfo.getUserInfo();
if (!ArrayUtils.isEmpty(mNoveltyInfo.getItems())) {
String imgUrl = mNoveltyInfo.getItems().get(0).getThumbnail();
if (TextUtils.isEmpty(imgUrl)) {
@@ -245,19 +234,18 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
}
ivEventReportTrue.setOnClickListener(v -> {
- roadReportTrue(mNoveltyInfo);
+ triggerReportTrue(mNoveltyInfo);
});
ivEventReportErr.setOnClickListener(v -> {
- roadReportErr(mNoveltyInfo);
+ triggerReportErr(mNoveltyInfo);
});
ivEventCallChart.setOnClickListener(v -> {
ivEventCallChart.setVisibility(GONE);
- roadCallChart(mNoveltyInfo);
+ triggerCallChart(mNoveltyInfo);
});
ivEventZan.setOnClickListener(v -> {
- handlerZan(mNoveltyInfo);
+ triggerZan(mNoveltyInfo);
});
-
}
} catch (Exception e) {
e.printStackTrace();
@@ -294,6 +282,11 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
}
}
+ /**
+ * 为了给车聊聊更多的信息需要重新查询一次
+ *
+ * @param noveltyInfo
+ */
private void requestUserInfo(MarkerExploreWay noveltyInfo) {
Logger.d(MODULE_NAME, "上报事件的用户SN:" + noveltyInfo.getSn());
// 获取道路事件周边的直播车机
@@ -322,6 +315,9 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
mUserInfo.setUserHead(infoBean.getHeadImgUrl());
mUserInfo.setGender(infoBean.getCardIdSex());
+ // 重新设置用户信息
+ mNoveltyInfo.setUserInfo(mUserInfo);
+
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
// 判断是否可以打电话
ChartingUtil.isCanCall(b -> {
@@ -350,86 +346,17 @@ public class V2XRoadEventDetailVH extends RecyclerView.ViewHolder {
}
}
-
- /**
- * 打电话
- */
- private void roadCallChart(MarkerExploreWay noveltyInfo) {
- MarkerLocation location = new MarkerLocation();
- mUserInfo.setSn(noveltyInfo.getSn());
- ChartingUtil.callChatting(mUserInfo, location);
- TrackUtils.trackV2xRoadEvent(noveltyInfo.getInfoId(), noveltyInfo.getUserInfo().getSn(), V2XConst.V2X_ROAD_CHAT);
- }
-
- /**
- * 反馈路况错误
- */
- private void roadReportErr(MarkerExploreWay noveltyInfo) {
- if (noveltyInfo != null) {
- RoadConditionUtils.sendDataErrorReceiverInfo(
- noveltyInfo.getPoiType(),
- noveltyInfo.getInfoId(),
- "1");
-
- TrackUtils.trackV2xRoadEvent(noveltyInfo.getInfoId(), noveltyInfo.getUserInfo().getSn(), V2XConst.V2X_ROAD_REPORT_ERROR);
- }
- delayedCloseWindow();
- }
-
- /**
- * 反馈路况正确
- */
- private void roadReportTrue(MarkerExploreWay noveltyInfo) {
- if (noveltyInfo != null) {
- RoadConditionUtils.sendDataErrorReceiverInfo(
- noveltyInfo.getPoiType(),
- noveltyInfo.getInfoId(),
- "2");
- TrackUtils.trackV2xRoadEvent(noveltyInfo.getInfoId(), noveltyInfo.getUserInfo().getSn(), V2XConst.V2X_ROAD_REPORT_RIGHT);
- }
- delayedCloseWindow();
- }
-
- /**
- * 点赞
- */
- private void handlerZan(MarkerExploreWay noveltyInfo) {
- try {
- AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已点赞", null);
- showTip("已点赞");
- if (noveltyInfo != null) {
- V2XServiceManager.getV2XMarkerService()
- .getV2XRefreshModel()
- .giveLikeLiveVideo(null, noveltyInfo.getSn());
- }
- delayedCloseWindow();
- } catch (Exception e) {
- e.printStackTrace();
- }
- TrackUtils.trackV2xRoadEvent(noveltyInfo.getInfoId(), noveltyInfo.getUserInfo().getSn(), V2XConst.V2X_ROAD_ZAN);
- }
-
/**
* 延迟关闭窗体
*/
- private void delayedCloseWindow() {
- itemView.postDelayed(new Runnable() {
- @Override
- public void run() {
- // 移除窗体
- V2XServiceManager
- .getIMogoWindowManager()
- .removeView(V2XRoadEventScenario.getInstance().getV2XWindow().getView());
- V2XRoadEventScenario.getInstance().close();
- }
+ @Override
+ public void delayedCloseWindow() {
+ itemView.postDelayed(() -> {
+ // 移除窗体
+ V2XServiceManager
+ .getIMogoWindowManager()
+ .removeView(V2XRoadEventScenario.getInstance().getV2XWindow().getView());
+ V2XRoadEventScenario.getInstance().close();
}, 1000);
}
-
- 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);
- }
}
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 39cb846516..bcffecdee1 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
@@ -93,12 +93,12 @@ public class V2XScenarioManager implements IV2XScenarioManager {
mV2XScenario = V2XIllegalParkScenario.getInstance();
break;
default:
+ Logger.e(MODULE_NAME, "当前V2X消息类型未定义。");
ToastUtils.showLong("当前V2X消息类型未定义。");
return;
}
}
-
// 展示最新的消息
if (mV2XScenario != null) {
mV2XScenario.init(v2XMessageEntity);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java
index 0ece153745..bef1acd8d1 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java
@@ -8,9 +8,9 @@ import android.view.View;
import androidx.constraintlayout.widget.ConstraintLayout;
+import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.listener.V2XWindowStatusListener;
import com.mogo.module.v2x.scenario.view.IV2XWindow;
import com.mogo.module.v2x.view.TextureVideoView;
@@ -58,36 +58,38 @@ public class V2XAnimationWindow extends ConstraintLayout implements IV2XWindow {
Logger.w(MODULE_NAME, "场景动画准备。。。。。");
});
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
index df84f6b80a..ef2475f7f6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
@@ -13,21 +13,30 @@ import java.util.Map;
public class TrackUtils {
//埋点
- public static void trackV2xRoadShow(String dbid,String type, String style) {
- Map properties = new HashMap<>();
- properties.put("dbid", dbid);
- properties.put("type", type);
- properties.put("lng", V2XStatusManager.getInstance().getLocation().getLongitude());
- properties.put("lat", V2XStatusManager.getInstance().getLocation().getLatitude());
- properties.put("style", style);
- V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
+ public static void trackV2xRoadShow(String dbid, String type, String style) {
+ try {
+ Map properties = new HashMap<>();
+ properties.put("dbid", dbid);
+ properties.put("type", type);
+ properties.put("lng", V2XStatusManager.getInstance().getLocation().getLongitude());
+ properties.put("lat", V2XStatusManager.getInstance().getLocation().getLatitude());
+ properties.put("style", style);
+ V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+
//道路事件操作埋点 v2x_road_event
- public static void trackV2xRoadEvent(String dbid, String sn ,String type) {
- Map properties = new HashMap<>();
- properties.put("dbid", dbid);
- properties.put("sn", sn);
- properties.put("type", type);
- V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_EVET, properties);
+ public static void trackV2xRoadEvent(String dbid, String sn, String type) {
+ try {
+ Map properties = new HashMap<>();
+ properties.put("dbid", dbid);
+ properties.put("sn", sn);
+ properties.put("type", type);
+ V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_EVET, properties);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/btn_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/btn_parking_nav.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/btn_parking_nav.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/btn_parking_nav.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_car_ambulance.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_ambulance.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_car_ambulance.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_ambulance.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_car_gray.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_gray.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_car_gray.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_gray.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_car_police.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_police.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_car_police.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_police.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_car_red.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_red.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_car_red.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_red.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_car_rescue.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_rescue.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_car_rescue.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_rescue.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_default_black_logo.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_heart_like.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_like.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_heart_like.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_like.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_heart_like_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_like_bg.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_heart_like_bg.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_like_bg.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_heart_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_heart_unlike.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_heart_unlike_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike_bg.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_heart_unlike_bg.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike_bg.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_illegal_parking.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_illegal_parking.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_illegal_parking_like.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_like.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_illegal_parking_like.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_like.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_illegal_parking_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_unlike.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_illegal_parking_unlike.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_unlike.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_live_load_error.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_live_load_error.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_live_load_error.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_live_load_error.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_nav.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_nav.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_nav.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_nav.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_parking_nav.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_nav.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_parking_p.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_p.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_parking_p.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_p.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_parting_icon.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_report_err.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_report_err.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_report_true.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_report_true.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_talk.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_talk.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_talk.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_talk.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/icon_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_warn.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/icon_warn.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_warn.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_live.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_live.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_live.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_live.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_live_press.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_live_press.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_live_press.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_live_press.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_nav.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_nav.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_nav.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_nav_press.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_nav_press.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_nav_press.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_nav_press.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_talk.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_talk.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_talk.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_talk.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_talk_press.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_talk_press.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_talk_press.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_talk_press.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_zan.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_zan.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_event_icon_zan.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_icon_zan.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_event_live_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_close.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_event_live_close.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_close.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_event_live_top.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_top.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_event_live_top.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_top.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_event_play.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_play.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_event_play.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_play.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_fault_help_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_fault_help_warn.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_fault_help_warn.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_fault_help_warn.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_gas_money.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_money.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_gas_money.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_money.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_gas_station_refuel.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_station_refuel.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_gas_station_refuel.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_station_refuel.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_help_navi.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_help_navi.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_help_navi.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_help_navi.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_live_logo.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_location.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_location.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_location.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_location.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_p.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_p.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_p.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_p.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_zan1.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan1.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_zan1.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan1.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_zan2.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan2.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_icon_zan2.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan2.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_gas_default.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_gas_default.jpg
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_gas_default.jpg
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_gas_default.jpg
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_1.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_1.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_1.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_1.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_11.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_11.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_11.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_11.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_16.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_16.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_16.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_16.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_2.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_2.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_2.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_2.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_3.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_3.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_3.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_3.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_5.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_5.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_5.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_5.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_6.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_6.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_6.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_6.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_7.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_7.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_7.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_7.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_8.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_8.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_8.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_8.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_9.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_blue.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_blue.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_blue.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_error.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_error.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_error.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_error.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_green.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_green.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_green.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_green.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_info_blue.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_blue.9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_info_blue.9.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_blue.9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_info_green.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_green.9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_info_green.9.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_green.9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_info_red.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_red.9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_info_red.9.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_red.9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_live_vedio.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_live_vedio.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_live_vedio.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_live_vedio.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_red.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_red.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_car_red.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_red.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_express.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_express.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_express.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_express.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_taxi.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_marker_taxi.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_park_default.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_park_default.jpg
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_park_default.jpg
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_park_default.jpg
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_blue.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_car_blue.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_blue.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_car_orange.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_orange.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_car_orange.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_orange.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_car_red.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_car_red.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00000.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00000.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00000.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00000.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00001.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00001.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00001.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00001.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00002.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00002.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00002.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00002.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00003.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00003.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00003.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00003.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00004.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00004.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00004.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00004.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00005.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00005.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00005.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00005.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00006.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00006.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00006.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00006.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00007.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00007.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00007.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00007.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00008.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00008.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00008.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00008.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00009.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00009.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00009.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00009.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00010.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00010.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00010.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00010.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00011.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00011.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00011.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00011.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00012.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00012.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00012.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00012.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00013.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00013.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00013.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00013.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00015.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00015.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00015.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00015.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00017.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00017.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00017.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00017.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00018.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00018.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00018.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00018.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00019.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00019.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00019.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00019.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00020.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00020.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00020.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00020.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00023.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00023.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_orange_00023.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00023.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00000.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00000.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00000.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00000.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00001.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00001.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00001.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00001.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00002.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00002.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00002.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00002.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00003.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00003.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00003.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00003.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00004.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00004.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00004.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00004.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00005.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00005.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00005.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00005.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00006.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00006.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00006.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00006.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00007.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00007.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00007.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00007.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00008.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00008.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00008.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00008.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00009.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00009.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00009.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00009.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00010.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00010.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00010.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00010.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00011.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00011.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00011.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00011.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00012.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00012.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00012.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00012.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00013.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00013.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00013.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00013.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00015.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00015.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00015.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00015.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00017.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00017.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00017.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00017.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00018.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00018.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00018.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00018.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00020.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00020.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00020.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00020.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00023.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00023.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_circle_red_00023.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_red_00023.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_show_live.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_show_live.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v_to_x_warning_show_live.png
rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_show_live.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/btn_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/btn_parking_nav.png
new file mode 100644
index 0000000000..5119d9ca09
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/btn_parking_nav.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_ambulance.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_ambulance.png
new file mode 100644
index 0000000000..1fb8c62b72
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_ambulance.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_gray.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_gray.png
new file mode 100644
index 0000000000..d4266a6bc5
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_gray.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_police.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_police.png
new file mode 100644
index 0000000000..3407261744
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_police.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png
new file mode 100644
index 0000000000..df3b80e92c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_rescue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_rescue.png
new file mode 100644
index 0000000000..1f1400f558
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_rescue.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png
new file mode 100644
index 0000000000..f238846f9f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_like.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_like.png
new file mode 100644
index 0000000000..ce886a2383
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_like.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_like_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_like_bg.png
new file mode 100644
index 0000000000..f196b6ff8e
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_like_bg.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike.png
new file mode 100644
index 0000000000..0401ccc256
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike_bg.png
new file mode 100644
index 0000000000..33becf307e
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike_bg.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png
new file mode 100644
index 0000000000..a1da551655
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_video.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_video.png
new file mode 100644
index 0000000000..de6f715096
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_video.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_nav.png
new file mode 100644
index 0000000000..aa5658a972
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_nav.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_nav.png
new file mode 100644
index 0000000000..57abc3ccb6
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_nav.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_p.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_p.png
new file mode 100644
index 0000000000..6a642ee946
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_p.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parting_icon.png
new file mode 100644
index 0000000000..ad38331b25
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parting_icon.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png
new file mode 100644
index 0000000000..cc7ee57ee2
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png
new file mode 100644
index 0000000000..187a3a179b
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_talk.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_talk.png
new file mode 100644
index 0000000000..89680bd182
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_talk.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_warn.png
new file mode 100644
index 0000000000..1b039bafed
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_warn.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/live_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/live_error.png
new file mode 100644
index 0000000000..de6f715096
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/live_error.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_live.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_live.png
new file mode 100644
index 0000000000..c9be5c80ae
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_live.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_live_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_live_press.png
new file mode 100644
index 0000000000..d03db9ccf3
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_live_press.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_nav.png
new file mode 100644
index 0000000000..94f4de32d9
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_nav.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_nav_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_nav_press.png
new file mode 100644
index 0000000000..e3aeed7b92
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_nav_press.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_talk.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_talk.png
new file mode 100644
index 0000000000..ffb73a8dbc
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_talk.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_talk_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_talk_press.png
new file mode 100644
index 0000000000..db9134bd4d
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_talk_press.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_zan.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_zan.png
new file mode 100644
index 0000000000..c9db0a1ac4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_event_icon_zan.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_close.png
new file mode 100644
index 0000000000..fb0888da00
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_close.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_top.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_top.png
new file mode 100644
index 0000000000..db5d04ce7c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_top.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_play.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_play.png
new file mode 100644
index 0000000000..685e1a2058
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_play.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_fault_help_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_fault_help_warn.png
new file mode 100644
index 0000000000..7add47d66f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_fault_help_warn.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_money.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_money.png
new file mode 100644
index 0000000000..318b2820f1
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_money.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_station_refuel.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_station_refuel.png
new file mode 100644
index 0000000000..fb50e5483c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_station_refuel.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_help_navi.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_help_navi.png
new file mode 100644
index 0000000000..0152e59bb2
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_help_navi.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png
new file mode 100644
index 0000000000..dabf25dbbb
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_location.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_location.png
new file mode 100644
index 0000000000..e6f4f9f577
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_location.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_p.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_p.png
new file mode 100644
index 0000000000..193b7a5c07
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_p.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan1.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan1.png
new file mode 100644
index 0000000000..679347e5ee
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan1.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan2.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan2.png
new file mode 100644
index 0000000000..7c1f3352b2
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan2.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png
new file mode 100644
index 0000000000..8ac13e867f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png
new file mode 100644
index 0000000000..6c74ff6d78
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png
new file mode 100644
index 0000000000..2a1ca48c62
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png
new file mode 100644
index 0000000000..e6f2ee2d5c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png
new file mode 100644
index 0000000000..94af8b123e
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png
new file mode 100644
index 0000000000..f9f29cbe61
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png
new file mode 100644
index 0000000000..28c6860a3c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png
new file mode 100644
index 0000000000..72fbb4359f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png
new file mode 100644
index 0000000000..148086c831
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png
new file mode 100644
index 0000000000..7ad3b4abb5
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_blue.png
new file mode 100644
index 0000000000..a1f1c64566
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_blue.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_error.png
new file mode 100644
index 0000000000..82b4283fdc
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_error.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_green.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_green.png
new file mode 100644
index 0000000000..16eb35f38e
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_green.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_blue.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_blue.9.png
new file mode 100644
index 0000000000..9c81860194
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_blue.9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_green.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_green.9.png
new file mode 100644
index 0000000000..f47fb094d9
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_green.9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_red.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_red.9.png
new file mode 100644
index 0000000000..c830cb274c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_red.9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_live_vedio.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_live_vedio.png
new file mode 100644
index 0000000000..3b89ecae7c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_live_vedio.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_red.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_red.png
new file mode 100644
index 0000000000..cc09e40811
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_red.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png
new file mode 100644
index 0000000000..7e260c5693
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png
new file mode 100644
index 0000000000..c8ce535e58
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_blue.png
new file mode 100644
index 0000000000..cfeef25e75
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_blue.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_orange.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_orange.png
new file mode 100644
index 0000000000..70b3c056ea
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_orange.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png
new file mode 100644
index 0000000000..ed1542ea36
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_show_live.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_show_live.png
new file mode 100644
index 0000000000..63e1db1181
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_show_live.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index d50a321b55..adafb4b42e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -12,6 +12,7 @@
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"
@@ -63,15 +64,23 @@
+ app:miv_borderColor="#4cffffff"
+ app:miv_failureHolder="@drawable/icon_default_user_head"
+ app:miv_overlayImageId="@drawable/icon_default_user_head"
+ app:miv_placeHolder="@drawable/icon_default_user_head"
+ app:miv_shape="circle"
+ app:miv_shapeBorderWidth="@dimen/dp_4" />
@@ -92,10 +101,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_22"
+ android:layout_marginTop="@dimen/dp_20"
android:alpha="0.59"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_26"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpHead"
app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
tools:text="15:30发布求助信息" />
@@ -104,22 +114,20 @@
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_15"
- android:src="@drawable/icon_talk"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@drawable/icon_talk"
tools:visibility="visible" />
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
index 65da4f8036..93db1915b9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
@@ -32,26 +32,4 @@
app:miv_shapeBorderWidth="@dimen/dp_4"
tools:visibility="visible" />
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml b/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml
index a808edd9fa..a328f43aa0 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml
@@ -8,8 +8,8 @@
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
index 5edf101879..027401f76f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
@@ -1,9 +1,8 @@
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
index 608f58a56e..771384674f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
@@ -57,9 +57,9 @@
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
index 25db21af05..3f2acc3bd0 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
@@ -12,8 +12,8 @@
@@ -23,6 +23,7 @@
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"
@@ -34,7 +35,7 @@
android:textSize="@dimen/dp_24"
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
- app:layout_constraintTop_toTopOf="@+id/ivIconP" />
+ app:layout_constraintTop_toTopOf="parent" />
+ tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 9698f6c830..91bc4c36a7 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -10,7 +10,10 @@
210px
+ 160px
+
90px
+ 120px
270px
480px
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 54e448bc1b..a63ecc25c4 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
@@ -10,7 +10,10 @@
230px
+ 160px
+
118px
+ 130px
320px
480px
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 439cae8746..3105233703 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -10,7 +10,11 @@
130px
- 65px
+ 82px
+
+ 54px
+
+ 64px
175px
262px