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/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
index 57bb85ae10..537f4f2b45 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
@@ -170,12 +170,22 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder {
.displayImage(mV2XPushMessageEntity.getHeadImgUrl(), ivHead);
}
tvName.setText(mV2XPushMessageEntity.getDisplayName());
- SpanUtils.with(tvDistance)
- .append("" + (int) mV2XPushMessageEntity.getDistance())
- .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
- .append("m")
- .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
- .create();
+
+ if (mV2XPushMessageEntity.getDistance() > 1000) {
+ SpanUtils.with(tvDistance)
+ .append("" + (int) mV2XPushMessageEntity.getDistance() / 1000)
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+ .append("km")
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+ .create();
+ } else {
+ SpanUtils.with(tvDistance)
+ .append("" + (int) mV2XPushMessageEntity.getDistance())
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+ .append("m")
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+ .create();
+ }
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
String eventTime = String.format("%s发布求助信息",
sdf.format(new Date(mV2XPushMessageEntity.getCreateTime())));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index e729e747b3..a6fe789e8f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -80,12 +80,21 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder 1000) {
+ SpanUtils.with(mTvFaultHelpDistance)
+ .append("" + (int) xPushMessageEntity.getDistance() / 1000)
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+ .append("km")
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+ .create();
+ } else {
+ SpanUtils.with(mTvFaultHelpDistance)
+ .append("" + (int) xPushMessageEntity.getDistance())
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text))
+ .append("m")
+ .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title))
+ .create();
+ }
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
String eventTime = String.format("%s发布求助信息",
sdf.format(new Date(xPushMessageEntity.getCreateTime())));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 016d087b53..c4e71eae6f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -49,7 +49,7 @@ class V2XEventPanelFragment : MvpFragment
try {
- rgTabSelect?.check(R.id.rbScenarioHistory)
+ rbScenarioHistory?.isChecked=true
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
@@ -58,7 +58,7 @@ class V2XEventPanelFragment : MvpFragment
try {
- rgTabSelect?.check(R.id.rbSurroundingEvent)
+ rbSurroundingEvent?.isChecked=true
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
@@ -67,7 +67,7 @@ class V2XEventPanelFragment : MvpFragment
try {
- rgTabSelect?.check(R.id.rbShareEvents)
+ rbShareEvents?.isChecked=true
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
index a4667dded3..cd5cf436af 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
@@ -3,7 +3,7 @@
{
"createTime":1593678359872,
"distance":100,
- "lat":39.966668,
+ "lat":39.866668,
"lon":116.411211,
"sn":"ZD801B1932L00041",
"targetId":20007,