diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java
index 9dc23e7587..df19dc6d38 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java
@@ -28,7 +28,7 @@ public class ArcView extends View {
//圆弧颜色
private int mArcColor;
//圆弧的画笔的宽度
- private float mStrokeWith = 10;
+ private float mStrokeWith = dp2px(10);
//文字描述的paint
private Paint mTextPaint;
@@ -77,7 +77,7 @@ public class ArcView extends View {
mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
//绘制中心文字描述
- mTextPaint.setTextSize(28);
+ mTextPaint.setTextSize(dp2px(28));
mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect);
canvas.drawText(mDes, getWidth() / 2, getHeight() * 17 / 20 + mRect.height() / 2, mTextPaint);
}
@@ -116,7 +116,7 @@ public class ArcView extends View {
//设置文本的对齐方式
mTextPaint.setTextAlign(Paint.Align.CENTER);
//mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12));
- mTextPaint.setTextSize(80);
+ mTextPaint.setTextSize(dp2px(80));
}
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 25b899c7ca..7e33a9a6bf 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -7,7 +7,6 @@
android:layout_height="match_parent">
-
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..c4155f70f7
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,8 @@
+
+
+ 1100px
+ 460px
+ 460px
+ 320px
+ 320px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index ca44fd8dcb..67bc009a50 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -98,7 +98,8 @@
40px
30px
34px
- 24px
+ 24px
+
28px
24px
17px
@@ -181,4 +182,10 @@
393px
700px
+ 300px
+ 300px
+
+ 200px
+ 200px
+
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
index 683134de62..36fdbfc26e 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsHelper.java
@@ -2,6 +2,8 @@ package com.mogo.module.main.utils;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
+import android.content.res.Resources;
+import android.util.DisplayMetrics;
import android.view.View;
import com.mogo.module.main.R;
@@ -44,4 +46,9 @@ public class DisplayEffectsHelper {
public void display() {
animatorSet.start();
}
+
+ private float dp2px(float dp) {
+ DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
+ return dp * metrics.density;
+ }
}
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png
new file mode 100644
index 0000000000..0ab8e44e21
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png
new file mode 100644
index 0000000000..aff4543048
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png differ
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
index 93d9c8cde2..197e49dfc5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
@@ -26,6 +26,7 @@ import com.zhidao.carchattingprovider.MogoDriverInfo;
import java.util.List;
import static android.text.style.TtsSpan.GENDER_MALE;
+import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
* V2X 测试面板广播接收,目的是可以通过广播调用起来面板
@@ -166,6 +167,13 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver {
V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT);
} else if (sceneType == 20) { //test visualAngle UI
V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_CLOSE_SIGHT);
+ } else if (sceneType == 21) {// 自车求助
+ V2XMessageEntity v2XMessageEntity =
+ TestOnLineCarUtils.getV2XScenarioCarForHelpEventData();
+ Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
+ intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
+ LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
+ V2XServiceManager.getMoGoStatusManager().setSeekHelping(MODULE_NAME, true);
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
index 13be5af0ac..9c7a04a9f3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
@@ -84,7 +84,7 @@ public class V2XSeekHelpButton implements IV2XButton {
doAction();
});
ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
- (int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_150));
+ (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_car_for_help_window_height));
V2XServiceManager.getMogoTopViewManager().addView(topView, layoutParams);
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index f4c0dedff9..381d9d460f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -465,4 +465,25 @@ public class TestOnLineCarUtils {
}
return null;
}
+ /**
+ * 自车求助测试数据
+ */
+ public static V2XMessageEntity getV2XScenarioCarForHelpEventData() {
+ try {
+
+ V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>();
+ // 控制类型
+ v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP);
+ // 设置数据
+ v2xMessageEntity.setContent(true);
+ // 控制展示状态
+ v2xMessageEntity.setShowState(true);
+ return v2xMessageEntity;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/icon_play.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/icon_play.png
new file mode 100644
index 0000000000..bd17c2a12c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/icon_play.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
new file mode 100644
index 0000000000..3b658c62d3
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
new file mode 100644
index 0000000000..4510b5c3c1
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
new file mode 100644
index 0000000000..d5cca39f45
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
new file mode 100644
index 0000000000..3ed7564641
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
new file mode 100644
index 0000000000..3c2b759b40
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
index b7428f06fb..a3ba69250b 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index adfeb53772..1069f4c9f0 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -222,14 +222,14 @@
+ android:textSize="30sp" />
@@ -273,9 +273,9 @@
android:id="@+id/tv_line"
android:layout_width="@dimen/dp_0_5"
android:layout_height="@dimen/dp_70"
+ android:alpha="0.3"
android:background="@color/v2x_line_color"
android:visibility="gone"
- android:alpha="0.3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_play"
app:layout_constraintStart_toEndOf="@+id/ll_event"
@@ -285,13 +285,13 @@
@@ -83,7 +83,7 @@
android:layout_marginRight="@dimen/dp_42"
android:gravity="center_vertical"
android:textColor="#FFFFFF"
- android:textSize="@dimen/dp_42"
+ android:textSize="@dimen/module_v2x_fault_help_distance_text_size"
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
@@ -91,8 +91,8 @@
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
index 4411a57baf..05f72a463e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_822"
- android:layout_height="@dimen/dp_182"
+ android:layout_height="@dimen/module_v2x_event_window_height_vr"
android:layout_marginTop="@dimen/dp_8">
+
+
+ 227px
+ 187px
+ 133px
+ 133px
+
+
+ 234px
+ 1067px
+ 187px
+
+ 107px
+ 47px
+
+ 35px
+ 48px
+ 35px
+ 36px
+ 64px
+ 108px
+
+ 53px
+
+ 200px
+ 854px
+ 187px
+ 133px
+ 133px
+ 480px
+ 42px
+ 40px
+
\ No newline at end of file
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 1882f8ea15..6ca53077b7 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
@@ -128,4 +128,30 @@
46px
26px
+ 140px
+
+ 100px
+ 100px
+
+ 800px
+ 140px
+
+ 80px
+ 35px
+
+ 27px
+ 40px
+ 27px
+ 24px
+ 42px
+ 80px
+ 40px
+ 150px
+ 640px
+ 140px
+ 100px
+ 100px
+ 480px
+ 32px
+ 30px