diff --git a/gradle.properties b/gradle.properties
index ae69738a72..45c439c828 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
## 工程外部模块
# 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.13
+MOGO_MODULE_TANLU_VERSION=1.3.1.16
# 车聊聊
CARCHATTING_VERSION=1.4.8
# 车聊聊接口
@@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
# 广告资源位
MOGO_MODULE_AD_CARD_VERSION=1.0.1
# 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.13
+TANLULIB_VERSION=1.3.1.16
MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
#左侧面板模块
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
index 67437cda97..3536c79096 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
@@ -9,17 +9,17 @@
android:id="@+id/vpEventPanel"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="gone"/>
+ android:visibility="gone" />
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png
new file mode 100644
index 0000000000..5923d114f6
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png
new file mode 100644
index 0000000000..dbc420e8e6
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png differ
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
index 09f0e3441b..0a901e78ad 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
@@ -18,6 +18,7 @@ import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
import com.mogo.module.v2x.utils.ChartingUtil;
+import com.mogo.module.v2x.utils.SpanUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.service.imageloader.MogoImageView;
import com.mogo.utils.logger.Logger;
@@ -103,7 +104,7 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter imp
if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
showWindow();
}
+
+ // 地图主动推送/触发消息 埋点
+ String poiType = mV2XMessageEntity.getContent().getPoiType();
+ String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
+ String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
+ String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
+ String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
+ Map properties = new HashMap<>();
+ properties.put("dbid", infoId);
+ properties.put("type", poiType);
+ properties.put("lng", lon);
+ properties.put("lat", lat);
+ properties.put("style", style);
+ V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
}
}
@@ -128,19 +142,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp
V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, true);
}
- // 地图主动推送/触发消息 埋点
- String poiType = mV2XMessageEntity.getContent().getPoiType();
- String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
- String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
- String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
- String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
- Map properties = new HashMap<>();
- properties.put("dbid", infoId);
- properties.put("type", poiType);
- properties.put("lng", lon);
- properties.put("lat", lat);
- properties.put("style", style);
- V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
+
}
@Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
index 4302c9d997..09e6941de4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
@@ -1,15 +1,10 @@
package com.mogo.module.v2x.utils;
import android.content.Intent;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
import com.mogo.commons.voice.AIAssist;
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
+import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -92,10 +87,6 @@ public class RoadConditionUtils {
*/
private static void showTip() {
AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已反馈", null);
- ToastUtils.setGravity(Gravity.CENTER, 0, 0);
- View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
- TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
- msgView.setText("已反馈");
- ToastUtils.showCustomShort(toastView);
+ TipToast.tip("已反馈");
}
}
diff --git a/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
index 2982515e45..80c10a9a34 100644
--- a/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
+++ b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
@@ -4,13 +4,13 @@
android:duration="100"
android:propertyName="translationX"
android:valueFrom="0"
- android:valueTo="-2"
+ android:valueTo="-5"
android:valueType="floatType" />
@@ -18,13 +18,13 @@
android:duration="100"
android:propertyName="translationX"
android:valueFrom="0"
- android:valueTo="2"
+ android:valueTo="5"
android:valueType="floatType" />
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png
new file mode 100644
index 0000000000..7dcda74ee9
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
index 3a224c6654..ee2a754125 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
@@ -1,11 +1,10 @@
-
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
index f7c6793422..cac876ff3f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
@@ -8,7 +8,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
- app:roundLayoutRadius="@dimen/dp_30">
+ app:roundLayoutRadius="@dimen/dp_40">
+ app:roundLayoutRadius="@dimen/dp_40">
-
-
-
-
-
-
-
-
-
+ android:paddingEnd="@dimen/dp_40"
+ app:roundLayoutRadius="@dimen/dp_40">
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_chainStyle="packed" />
+
+
+ app:roundLayoutRadius="@dimen/dp_40" />
+ app:roundLayoutRadius="@dimen/dp_40">
\ No newline at end of file
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 027401f76f..3f1ffbd440 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
@@ -10,7 +10,6 @@
android:id="@+id/ivIllegalParkingUnLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerInParent="true"
android:src="@drawable/icon_heart_unlike" />
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
index c933ac0ead..77c61a79a2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height"
android:background="@color/live_video_background_color"
- app:roundLayoutRadius="@dimen/dp_30">
+ app:roundLayoutRadius="@dimen/dp_40">
+ app:roundLayoutRadius="@dimen/dp_40">
+ app:roundLayoutRadius="@dimen/dp_40">
+ app:roundLayoutRadius="@dimen/dp_40">
+ app:layout_constraintTop_toTopOf="@+id/ivIconP" />
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 721fba8c3c..b8069b67c7 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
@@ -8,11 +8,11 @@
450px
390px
- 210px
+ 200px
160px
- 90px
+ 110px
100px
270px
diff --git a/modules/mogo-module-v2x/src/main/res/values/color.xml b/modules/mogo-module-v2x/src/main/res/values/color.xml
index 0faa50d319..f8a3476000 100644
--- a/modules/mogo-module-v2x/src/main/res/values/color.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/color.xml
@@ -1,5 +1,5 @@
#256BFF
- #FF3F4057
+ #3F4057
\ No newline at end of file